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

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

Issue 12087124: Disable touch calibration on external touchscreen. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix Win compilation take 2 + rebase Created 7 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
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 #include <vector> 10 #include <vector>
(...skipping 14 matching lines...) Expand all
25 25
26 namespace aura { 26 namespace aura {
27 27
28 namespace internal { 28 namespace internal {
29 class TouchEventCalibrate; 29 class TouchEventCalibrate;
30 } 30 }
31 31
32 class RootWindowHostLinux : public RootWindowHost, 32 class RootWindowHostLinux : public RootWindowHost,
33 public MessageLoop::Dispatcher { 33 public MessageLoop::Dispatcher {
34 public: 34 public:
35 explicit RootWindowHostLinux(const gfx::Rect& bounds); 35 explicit RootWindowHostLinux(const gfx::Rect& bounds,
36 bool is_internal_display);
36 virtual ~RootWindowHostLinux(); 37 virtual ~RootWindowHostLinux();
37 38
38 // Overridden from Dispatcher overrides: 39 // Overridden from Dispatcher overrides:
39 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; 40 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
40 41
41 // RootWindowHost Overrides. 42 // RootWindowHost Overrides.
42 virtual void SetDelegate(RootWindowHostDelegate* delegate) OVERRIDE; 43 virtual void SetDelegate(RootWindowHostDelegate* delegate) OVERRIDE;
43 virtual RootWindow* GetRootWindow() OVERRIDE; 44 virtual RootWindow* GetRootWindow() OVERRIDE;
44 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; 45 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
45 virtual void Show() OVERRIDE; 46 virtual void Show() OVERRIDE;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 bool focus_when_shown_; 120 bool focus_when_shown_;
120 121
121 scoped_ptr<XID[]> pointer_barriers_; 122 scoped_ptr<XID[]> pointer_barriers_;
122 123
123 scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_; 124 scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;
124 125
125 scoped_ptr<MouseMoveFilter> mouse_move_filter_; 126 scoped_ptr<MouseMoveFilter> mouse_move_filter_;
126 127
127 ui::X11AtomCache atom_cache_; 128 ui::X11AtomCache atom_cache_;
128 129
130 // True if RootWindow corresponds to an internal display (on ChromeOS).
131 bool is_internal_display_;
132
129 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); 133 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux);
130 }; 134 };
131 135
132 } // namespace aura 136 } // namespace aura
133 137
134 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ 138 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698