| OLD | NEW |
| 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. |
| 11 #undef RootWindow | 11 #undef RootWindow |
| 12 | 12 |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
| 15 #include "ui/aura/root_window_host.h" | 15 #include "ui/aura/root_window_host.h" |
| 16 #include "ui/base/x/x11_atom_cache.h" | 16 #include "ui/base/x/x11_atom_cache.h" |
| 17 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/rect.h" |
| 18 | 18 |
| 19 namespace ui { | 19 namespace ui { |
| 20 class ViewProp; | 20 class ViewProp; |
| 21 } | 21 } |
| 22 | 22 |
| 23 namespace aura { | 23 namespace aura { |
| 24 | 24 |
| 25 namespace internal { |
| 26 class TouchEventCalibrate; |
| 27 } |
| 28 |
| 25 class RootWindowHostLinux : public RootWindowHost, | 29 class RootWindowHostLinux : public RootWindowHost, |
| 26 public MessageLoop::Dispatcher { | 30 public MessageLoop::Dispatcher { |
| 27 public: | 31 public: |
| 28 RootWindowHostLinux(RootWindowHostDelegate* delegate, | 32 RootWindowHostLinux(RootWindowHostDelegate* delegate, |
| 29 const gfx::Rect& bounds); | 33 const gfx::Rect& bounds); |
| 30 virtual ~RootWindowHostLinux(); | 34 virtual ~RootWindowHostLinux(); |
| 31 | 35 |
| 32 // Overridden from Dispatcher overrides: | 36 // Overridden from Dispatcher overrides: |
| 33 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; | 37 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; |
| 34 | 38 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 // The bounds of |x_root_window_|. | 98 // The bounds of |x_root_window_|. |
| 95 gfx::Rect x_root_bounds_; | 99 gfx::Rect x_root_bounds_; |
| 96 | 100 |
| 97 // True if the window should be focused when the window is shown. | 101 // True if the window should be focused when the window is shown. |
| 98 bool focus_when_shown_; | 102 bool focus_when_shown_; |
| 99 | 103 |
| 100 scoped_array<XID> pointer_barriers_; | 104 scoped_array<XID> pointer_barriers_; |
| 101 | 105 |
| 102 scoped_ptr<ui::ViewProp> prop_; | 106 scoped_ptr<ui::ViewProp> prop_; |
| 103 | 107 |
| 108 scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_; |
| 109 |
| 104 ui::X11AtomCache atom_cache_; | 110 ui::X11AtomCache atom_cache_; |
| 105 | 111 |
| 106 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); | 112 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); |
| 107 }; | 113 }; |
| 108 | 114 |
| 109 } // namespace aura | 115 } // namespace aura |
| 110 | 116 |
| 111 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ | 117 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ |
| OLD | NEW |