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

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: 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
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 // Current Aura cursor. 78 // Current Aura cursor.
79 gfx::NativeCursor current_cursor_; 79 gfx::NativeCursor current_cursor_;
80 80
81 // Is the window mapped to the screen? 81 // Is the window mapped to the screen?
82 bool window_mapped_; 82 bool window_mapped_;
83 83
84 // Is the cursor currently shown? 84 // Is the cursor currently shown?
85 bool cursor_shown_; 85 bool cursor_shown_;
86 86
87 // The invisible cursor.
88 ::Cursor invisible_cursor_;
89
90 // The bounds of |xwindow_|. 87 // The bounds of |xwindow_|.
91 gfx::Rect bounds_; 88 gfx::Rect bounds_;
92 89
93 // True if the window should be focused when the window is shown. 90 // True if the window should be focused when the window is shown.
94 bool focus_when_shown_; 91 bool focus_when_shown_;
95 92
96 scoped_array<XID> pointer_barriers_; 93 scoped_array<XID> pointer_barriers_;
97 94
98 scoped_ptr<ui::ViewProp> prop_; 95 scoped_ptr<ui::ViewProp> prop_;
99 96
100 class ImageCursors;
101 scoped_ptr<ImageCursors> image_cursors_;
102
103 X11AtomCache atom_cache_; 97 X11AtomCache atom_cache_;
104 98
105 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); 99 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux);
106 }; 100 };
107 101
108 } // namespace aura 102 } // namespace aura
109 103
110 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ 104 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698