| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_PLATFORM_WINDOW_X11_X11_WINDOW_H_ | 5 #ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ |
| 6 #define UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ | 6 #define UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ |
| 7 | 7 |
| 8 #include "ui/events/platform/platform_event_dispatcher.h" | 8 #include "ui/events/platform/platform_event_dispatcher.h" |
| 9 #include "ui/gfx/geometry/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
| 10 #include "ui/gfx/x/x11_atom_cache.h" | 10 #include "ui/gfx/x/x11_atom_cache.h" |
| 11 #include "ui/platform_window/platform_window.h" | 11 #include "ui/platform_window/types/platform_window.h" |
| 12 #include "ui/platform_window/platform_window_delegate.h" | 12 #include "ui/platform_window/types/platform_window_delegate.h" |
| 13 #include "ui/platform_window/x11/x11_window_export.h" | 13 #include "ui/platform_window/x11/x11_window_export.h" |
| 14 | 14 |
| 15 typedef struct _XDisplay XDisplay; | 15 typedef struct _XDisplay XDisplay; |
| 16 typedef unsigned long XID; | 16 typedef unsigned long XID; |
| 17 | 17 |
| 18 namespace ui { | 18 namespace ui { |
| 19 | 19 |
| 20 class X11_WINDOW_EXPORT X11Window : public PlatformWindow, | 20 class X11_WINDOW_EXPORT X11Window : public PlatformWindow, |
| 21 public PlatformEventDispatcher { | 21 public PlatformEventDispatcher { |
| 22 public: | 22 public: |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 gfx::Rect confirmed_bounds_; | 59 gfx::Rect confirmed_bounds_; |
| 60 | 60 |
| 61 bool window_mapped_; | 61 bool window_mapped_; |
| 62 | 62 |
| 63 DISALLOW_COPY_AND_ASSIGN(X11Window); | 63 DISALLOW_COPY_AND_ASSIGN(X11Window); |
| 64 }; | 64 }; |
| 65 | 65 |
| 66 } // namespace ui | 66 } // namespace ui |
| 67 | 67 |
| 68 #endif // UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ | 68 #endif // UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ |
| OLD | NEW |