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

Side by Side Diff: ui/aura/root_window_host_linux.h

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_AURA_ROOT_WINDOW_HOST_LINUX_H_ 5 #ifndef UI_AURA_ROOT_WINDOW_HOST_LINUX_H_
6 #define UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ 6 #define UI_AURA_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.
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // The bounds of |x_root_window_|. 94 // The bounds of |x_root_window_|.
95 gfx::Rect x_root_bounds_; 95 gfx::Rect x_root_bounds_;
96 96
97 // True if the window should be focused when the window is shown. 97 // True if the window should be focused when the window is shown.
98 bool focus_when_shown_; 98 bool focus_when_shown_;
99 99
100 scoped_array<XID> pointer_barriers_; 100 scoped_array<XID> pointer_barriers_;
101 101
102 scoped_ptr<ui::ViewProp> prop_; 102 scoped_ptr<ui::ViewProp> prop_;
103 103
104 class ImageCursors;
105 scoped_ptr<ImageCursors> image_cursors_;
106
107 X11AtomCache atom_cache_; 104 X11AtomCache atom_cache_;
108 105
109 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); 106 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux);
110 }; 107 };
111 108
112 } // namespace aura 109 } // namespace aura
113 110
114 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ 111 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_
OLDNEW
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698