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

Side by Side Diff: ui/views/widget/desktop_root_window_host_linux.h

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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_ROOT_WINDOW_HOST_LINUX_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
11 #undef RootWindow 11 #undef RootWindow
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "ui/aura/client/cursor_client.h" 15 #include "ui/aura/client/cursor_client.h"
16 #include "ui/aura/root_window_host.h" 16 #include "ui/aura/root_window_host.h"
17 #include "ui/gfx/rect.h" 17 #include "ui/gfx/rect.h"
18 #include "ui/base/cursor/cursor_loader_x11.h" 18 #include "ui/base/cursor/cursor_loader_x11.h"
19 #include "ui/base/x/x11_atom_cache.h" 19 #include "ui/base/x/x11_atom_cache.h"
20 #include "ui/views/ime/input_method_delegate.h" 20 #include "ui/views/ime/input_method_delegate.h"
21 #include "ui/views/views_export.h" 21 #include "ui/views/views_export.h"
22 #include "ui/views/widget/desktop_root_window_host.h" 22 #include "ui/views/widget/desktop_root_window_host.h"
23 23
24 namespace aura { 24 namespace aura {
25 class DesktopActivationClient; 25 class DesktopActivationClient;
26 class DesktopCursorClient; 26 class DesktopCursorClient;
27 class DesktopDispatcherClient; 27 class DesktopDispatcherClient;
28 class FocusManager; 28 class FocusManager;
29 namespace client { 29 namespace client {
30 class DefaultCaptureClient;
30 class ScreenPositionClient; 31 class ScreenPositionClient;
31 } 32 }
32 namespace shared { 33 namespace shared {
33 class CompoundEventFilter; 34 class CompoundEventFilter;
34 class InputMethodEventFilter; 35 class InputMethodEventFilter;
35 } 36 }
36 } 37 }
37 38
38 namespace views { 39 namespace views {
39 class DesktopCaptureClient;
40 class X11DesktopWindowMoveClient; 40 class X11DesktopWindowMoveClient;
41 class X11WindowEventFilter; 41 class X11WindowEventFilter;
42 42
43 class VIEWS_EXPORT DesktopRootWindowHostLinux 43 class VIEWS_EXPORT DesktopRootWindowHostLinux
44 : public DesktopRootWindowHost, 44 : public DesktopRootWindowHost,
45 public aura::RootWindowHost, 45 public aura::RootWindowHost,
46 public views::internal::InputMethodDelegate, 46 public views::internal::InputMethodDelegate,
47 public MessageLoop::Dispatcher { 47 public MessageLoop::Dispatcher {
48 public: 48 public:
49 DesktopRootWindowHostLinux( 49 DesktopRootWindowHostLinux(
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 // True if the window should be focused when the window is shown. 194 // True if the window should be focused when the window is shown.
195 bool focus_when_shown_; 195 bool focus_when_shown_;
196 196
197 // The window manager state bits. 197 // The window manager state bits.
198 std::set< ::Atom> window_properties_; 198 std::set< ::Atom> window_properties_;
199 199
200 // We are owned by the RootWindow, but we have to have a back pointer to it. 200 // We are owned by the RootWindow, but we have to have a back pointer to it.
201 aura::RootWindow* root_window_; 201 aura::RootWindow* root_window_;
202 202
203 // aura:: objects that we own. 203 // aura:: objects that we own.
204 scoped_ptr<DesktopCaptureClient> capture_client_; 204 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
205 scoped_ptr<aura::DesktopActivationClient> activation_client_; 205 scoped_ptr<aura::DesktopActivationClient> activation_client_;
206 scoped_ptr<aura::DesktopCursorClient> cursor_client_; 206 scoped_ptr<aura::DesktopCursorClient> cursor_client_;
207 scoped_ptr<aura::DesktopDispatcherClient> dispatcher_client_; 207 scoped_ptr<aura::DesktopDispatcherClient> dispatcher_client_;
208 scoped_ptr<aura::client::ScreenPositionClient> position_client_; 208 scoped_ptr<aura::client::ScreenPositionClient> position_client_;
209 209
210 // Current Aura cursor. 210 // Current Aura cursor.
211 gfx::NativeCursor current_cursor_; 211 gfx::NativeCursor current_cursor_;
212 212
213 // The invisible cursor. 213 // The invisible cursor.
214 ::Cursor invisible_cursor_; 214 ::Cursor invisible_cursor_;
(...skipping 21 matching lines...) Expand all
236 // can notify widgets when they have lost capture, which controls a bunch of 236 // can notify widgets when they have lost capture, which controls a bunch of
237 // things in views like hiding menus. 237 // things in views like hiding menus.
238 static DesktopRootWindowHostLinux* g_current_capture; 238 static DesktopRootWindowHostLinux* g_current_capture;
239 239
240 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostLinux); 240 DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostLinux);
241 }; 241 };
242 242
243 } // namespace views 243 } // namespace views
244 244
245 #endif // UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_ 245 #endif // UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_capture_client.cc ('k') | ui/views/widget/desktop_root_window_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698