Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 481836 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-16 / +23 lines)
Line  Link Here
0
-- brackets-shell/appshell/client_handler.h
0
++ brackets-shell/appshell/client_handler.h
Lines 16-22 Link Here
16
16
17
#include <algorithm> 
17
#include <algorithm> 
18
18
19
19
#if defined(OS_LINUX)
20
// The Linux client uses GTK instead of the underlying platform type (X11).
21
#include <gtk/gtk.h>
22
#define ClientWindowHandle GtkWidget*
23
#else
24
#define ClientWindowHandle CefWindowHandle
25
#endif
20
26
21
// Define this value to redirect all popup URLs to the main application browser
27
// Define this value to redirect all popup URLs to the main application browser
22
// window.
28
// window.
Lines 184-196 Link Here
184
                                    const CefKeyEvent& event,
190
                                    const CefKeyEvent& event,
185
                                    CefEventHandle os_event) OVERRIDE;
191
                                    CefEventHandle os_event) OVERRIDE;
186
192
187
  void SetMainHwnd(CefWindowHandle hwnd);
193
  void SetMainHwnd(ClientWindowHandle hwnd);
188
  CefWindowHandle GetMainHwnd() { return m_MainHwnd; }
194
  ClientWindowHandle GetMainHwnd() { return m_MainHwnd; }
189
  void SetEditHwnd(CefWindowHandle hwnd);
195
  void SetEditHwnd(ClientWindowHandle hwnd);
190
  void SetButtonHwnds(CefWindowHandle backHwnd,
196
  void SetButtonHwnds(ClientWindowHandle backHwnd,
191
                      CefWindowHandle forwardHwnd,
197
                      ClientWindowHandle forwardHwnd,
192
                      CefWindowHandle reloadHwnd,
198
                      ClientWindowHandle reloadHwnd,
193
                      CefWindowHandle stopHwnd);
199
                      ClientWindowHandle stopHwnd);
194
200
195
  CefRefPtr<CefBrowser> GetBrowser() { return m_Browser; }
201
  CefRefPtr<CefBrowser> GetBrowser() { return m_Browser; }
196
  int GetBrowserId() { return m_BrowserId; }
202
  int GetBrowserId() { return m_BrowserId; }
Lines 240-246 Link Here
240
  static void CreateRequestDelegates(RequestDelegateSet& delegates);
246
  static void CreateRequestDelegates(RequestDelegateSet& delegates);
241
247
242
  // The main frame window handle
248
  // The main frame window handle
243
  CefWindowHandle m_MainHwnd;
249
  ClientWindowHandle m_MainHwnd;
244
250
245
  // The child browser window. This is only set for the FIRST client window.
251
  // The child browser window. This is only set for the FIRST client window.
246
  // The browser id for m_Browser is stored in m_BrowserId.
252
  // The browser id for m_Browser is stored in m_BrowserId.
Lines 257-269 Link Here
257
  int m_BrowserId;
263
  int m_BrowserId;
258
264
259
  // The edit window handle
265
  // The edit window handle
260
  CefWindowHandle m_EditHwnd;
266
  ClientWindowHandle m_EditHwnd;
261
267
262
  // The button window handles
268
  // The button window handles
263
  CefWindowHandle m_BackHwnd;
269
  ClientWindowHandle m_BackHwnd;
264
  CefWindowHandle m_ForwardHwnd;
270
  ClientWindowHandle m_ForwardHwnd;
265
  CefWindowHandle m_StopHwnd;
271
  ClientWindowHandle m_StopHwnd;
266
  CefWindowHandle m_ReloadHwnd;
272
  ClientWindowHandle m_ReloadHwnd;
267
                          
273
                          
268
  // Support for logging.
274
  // Support for logging.
269
  std::string m_LogFile;
275
  std::string m_LogFile;
Lines 279-285 Link Here
279
  ProcessMessageDelegateSet process_message_delegates_;
285
  ProcessMessageDelegateSet process_message_delegates_;
280
  RequestDelegateSet request_delegates_;
286
  RequestDelegateSet request_delegates_;
281
287
282
  typedef std::map< CefWindowHandle, CefRefPtr<CefBrowser> > BrowserWindowMap;
288
  typedef std::map< ClientWindowHandle, CefRefPtr<CefBrowser> > BrowserWindowMap;
283
  static BrowserWindowMap browser_window_map_;
289
  static BrowserWindowMap browser_window_map_;
284
                        
290
                        
285
  typedef std::map<int32, CefRefPtr<CommandCallback> > CommandCallbackMap;
291
  typedef std::map<int32, CefRefPtr<CommandCallback> > CommandCallbackMap;
Lines 293-295 Link Here
293
};
299
};
294
300
295
#endif  // CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
301
#endif  // CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
302

Return to bug 481836