Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1704)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_root_window_host_x11.h

Issue 147203004: aura: Remove event-dispatch methods from WindowTreeHostDelegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_
7 7
8 #include <X11/extensions/shape.h> 8 #include <X11/extensions/shape.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 10
(...skipping 19 matching lines...) Expand all
30 class DesktopDragDropClientAuraX11; 30 class DesktopDragDropClientAuraX11;
31 class DesktopDispatcherClient; 31 class DesktopDispatcherClient;
32 class DesktopWindowTreeHostObserverX11; 32 class DesktopWindowTreeHostObserverX11;
33 class X11DesktopWindowMoveClient; 33 class X11DesktopWindowMoveClient;
34 class X11ScopedCapture; 34 class X11ScopedCapture;
35 class X11WindowEventFilter; 35 class X11WindowEventFilter;
36 36
37 class VIEWS_EXPORT DesktopWindowTreeHostX11 : 37 class VIEWS_EXPORT DesktopWindowTreeHostX11 :
38 public DesktopWindowTreeHost, 38 public DesktopWindowTreeHost,
39 public aura::WindowTreeHost, 39 public aura::WindowTreeHost,
40 public ui::EventSource,
40 public base::MessagePumpDispatcher { 41 public base::MessagePumpDispatcher {
41 public: 42 public:
42 DesktopWindowTreeHostX11( 43 DesktopWindowTreeHostX11(
43 internal::NativeWidgetDelegate* native_widget_delegate, 44 internal::NativeWidgetDelegate* native_widget_delegate,
44 DesktopNativeWidgetAura* desktop_native_widget_aura); 45 DesktopNativeWidgetAura* desktop_native_widget_aura);
45 virtual ~DesktopWindowTreeHostX11(); 46 virtual ~DesktopWindowTreeHostX11();
46 47
47 // A way of converting an X11 |xid| host window into a |content_window_|. 48 // A way of converting an X11 |xid| host window into a |content_window_|.
48 static aura::Window* GetContentWindowForXID(XID xid); 49 static aura::Window* GetContentWindowForXID(XID xid);
49 50
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; 147 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
147 virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE; 148 virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE;
148 virtual bool ConfineCursorToRootWindow() OVERRIDE; 149 virtual bool ConfineCursorToRootWindow() OVERRIDE;
149 virtual void UnConfineCursor() OVERRIDE; 150 virtual void UnConfineCursor() OVERRIDE;
150 virtual void OnCursorVisibilityChanged(bool show) OVERRIDE; 151 virtual void OnCursorVisibilityChanged(bool show) OVERRIDE;
151 virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; 152 virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
152 virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; 153 virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
153 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 154 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
154 virtual void PrepareForShutdown() OVERRIDE; 155 virtual void PrepareForShutdown() OVERRIDE;
155 156
157 // Overridden frm ui::EventSource
158 virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
159
156 private: 160 private:
157 // Initializes our X11 surface to draw on. This method performs all 161 // Initializes our X11 surface to draw on. This method performs all
158 // initialization related to talking to the X11 server. 162 // initialization related to talking to the X11 server.
159 void InitX11Window(const Widget::InitParams& params); 163 void InitX11Window(const Widget::InitParams& params);
160 164
161 // Creates an aura::RootWindow to contain the |content_window|, along with 165 // Creates an aura::RootWindow to contain the |content_window|, along with
162 // all aura client objects that direct behavior. 166 // all aura client objects that direct behavior.
163 aura::RootWindow* InitRootWindow(const Widget::InitParams& params); 167 aura::RootWindow* InitRootWindow(const Widget::InitParams& params);
164 168
165 // Returns true if there's an X window manager present... in most cases. Some 169 // Returns true if there's an X window manager present... in most cases. Some
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 scoped_ptr<X11ScopedCapture> x11_capture_; 292 scoped_ptr<X11ScopedCapture> x11_capture_;
289 293
290 base::string16 window_title_; 294 base::string16 window_title_;
291 295
292 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 296 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
293 }; 297 };
294 298
295 } // namespace views 299 } // namespace views
296 300
297 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ 301 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698