| 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_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_ | 5 #ifndef UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_ |
| 6 #define UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_ | 6 #define UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_ |
| 7 | 7 |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. | 9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. |
| 10 #undef RootWindow | 10 #undef RootWindow |
| 11 | 11 |
| 12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
| 13 #include "ui/aura/env_observer.h" | 13 #include "ui/aura/env_observer.h" |
| 14 #include "ui/aura/x11_atom_cache.h" | 14 #include "ui/aura/x11_atom_cache.h" |
| 15 #include "ui/views/views_export.h" | 15 #include "ui/views/views_export.h" |
| 16 | 16 |
| 17 template <typename T> struct DefaultSingletonTraits; |
| 18 |
| 17 namespace aura { | 19 namespace aura { |
| 18 class FocusManager; | 20 class FocusManager; |
| 19 class DesktopActivationClient; | 21 class DesktopActivationClient; |
| 20 } | 22 } |
| 21 | 23 |
| 22 namespace views { | 24 namespace views { |
| 23 | 25 |
| 24 // A singleton that owns global objects related to the desktop and listens for | 26 // A singleton that owns global objects related to the desktop and listens for |
| 25 // X11 events on the X11 root window. Destroys itself when aura::Env is | 27 // X11 events on the X11 root window. Destroys itself when aura::Env is |
| 26 // deleted. | 28 // deleted. |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 // Global focus/activation managers. | 64 // Global focus/activation managers. |
| 63 scoped_ptr<aura::FocusManager> focus_manager_; | 65 scoped_ptr<aura::FocusManager> focus_manager_; |
| 64 scoped_ptr<aura::DesktopActivationClient> desktop_activation_client_; | 66 scoped_ptr<aura::DesktopActivationClient> desktop_activation_client_; |
| 65 | 67 |
| 66 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); | 68 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); |
| 67 }; | 69 }; |
| 68 | 70 |
| 69 } // namespace views | 71 } // namespace views |
| 70 | 72 |
| 71 #endif // UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_ | 73 #endif // UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_ |
| OLD | NEW |