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

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

Issue 10905163: aura-x11: Fix touch-calibration for multi-monitor setups. (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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
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. 87 // The invisible cursor.
88 ::Cursor invisible_cursor_; 88 ::Cursor invisible_cursor_;
89 89
90 // The bounds of |xwindow_|. 90 // The bounds of |xwindow_|.
91 gfx::Rect bounds_; 91 gfx::Rect bounds_;
92 92
93 // The bounds of |x_root_window_|.
94 gfx::Rect root_bounds_;
Daniel Erat 2012/09/10 17:27:31 nit: "x_root_bounds_", or something including the
sadrul 2012/09/10 18:19:32 Done (changed to |x_root_bounds_|)
95
93 // True if the window should be focused when the window is shown. 96 // True if the window should be focused when the window is shown.
94 bool focus_when_shown_; 97 bool focus_when_shown_;
95 98
96 scoped_array<XID> pointer_barriers_; 99 scoped_array<XID> pointer_barriers_;
97 100
98 scoped_ptr<ui::ViewProp> prop_; 101 scoped_ptr<ui::ViewProp> prop_;
99 102
100 class ImageCursors; 103 class ImageCursors;
101 scoped_ptr<ImageCursors> image_cursors_; 104 scoped_ptr<ImageCursors> image_cursors_;
102 105
103 X11AtomCache atom_cache_; 106 X11AtomCache atom_cache_;
104 107
105 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); 108 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux);
106 }; 109 };
107 110
108 } // namespace aura 111 } // namespace aura
109 112
110 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ 113 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698