| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
| 10 | 10 |
| 11 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. | 11 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. |
| 12 #undef RootWindow | 12 #undef RootWindow |
| 13 | 13 |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
| 16 #include "ui/aura/root_window_host.h" | 16 #include "ui/aura/root_window_host.h" |
| 17 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/rect.h" |
| 18 | 18 |
| 19 namespace ui { |
| 20 class ViewProp; |
| 21 } |
| 22 |
| 19 namespace aura { | 23 namespace aura { |
| 20 | 24 |
| 21 class RootWindowHostLinux : public RootWindowHost, | 25 class RootWindowHostLinux : public RootWindowHost, |
| 22 public MessageLoop::Dispatcher { | 26 public MessageLoop::Dispatcher { |
| 23 public: | 27 public: |
| 24 explicit RootWindowHostLinux(const gfx::Rect& bounds); | 28 explicit RootWindowHostLinux(const gfx::Rect& bounds); |
| 25 virtual ~RootWindowHostLinux(); | 29 virtual ~RootWindowHostLinux(); |
| 26 | 30 |
| 27 // Overridden from Dispatcher overrides: | 31 // Overridden from Dispatcher overrides: |
| 28 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; | 32 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 | 92 |
| 89 ATOM_COUNT | 93 ATOM_COUNT |
| 90 }; | 94 }; |
| 91 ::Atom cached_atoms_[ATOM_COUNT]; | 95 ::Atom cached_atoms_[ATOM_COUNT]; |
| 92 | 96 |
| 93 // 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. |
| 94 bool focus_when_shown_; | 98 bool focus_when_shown_; |
| 95 | 99 |
| 96 scoped_array<XID> pointer_barriers_; | 100 scoped_array<XID> pointer_barriers_; |
| 97 | 101 |
| 102 scoped_ptr<ui::ViewProp> prop_; |
| 103 |
| 98 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); | 104 DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux); |
| 99 }; | 105 }; |
| 100 | 106 |
| 101 } // namespace aura | 107 } // namespace aura |
| 102 | 108 |
| 103 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ | 109 #endif // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_ |
| OLD | NEW |