| 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_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_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 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 XDisplay* xdisplay_; | 52 XDisplay* xdisplay_; |
| 53 | 53 |
| 54 // The native root window. | 54 // The native root window. |
| 55 ::Window x_root_window_; | 55 ::Window x_root_window_; |
| 56 | 56 |
| 57 // The activated window. | 57 // The activated window. |
| 58 ::Window current_window_; | 58 ::Window current_window_; |
| 59 | 59 |
| 60 ui::X11AtomCache atom_cache_; | 60 ui::X11AtomCache atom_cache_; |
| 61 | 61 |
| 62 bool wm_supports_active_window_; |
| 63 |
| 62 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); | 64 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); |
| 63 }; | 65 }; |
| 64 | 66 |
| 65 } // namespace views | 67 } // namespace views |
| 66 | 68 |
| 67 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ | 69 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ |
| OLD | NEW |