| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ | 5 #ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ |
| 6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ | 6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/message_loop/message_pump_libevent.h" | 10 #include "base/message_loop/message_pump_libevent.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; | 67 std::map<gfx::AcceleratedWidget, WaylandWindow*> window_map_; |
| 68 | 68 |
| 69 wl::Object<wl_display> display_; | 69 wl::Object<wl_display> display_; |
| 70 wl::Object<wl_registry> registry_; | 70 wl::Object<wl_registry> registry_; |
| 71 wl::Object<wl_compositor> compositor_; | 71 wl::Object<wl_compositor> compositor_; |
| 72 wl::Object<wl_seat> seat_; | 72 wl::Object<wl_seat> seat_; |
| 73 wl::Object<wl_shm> shm_; | 73 wl::Object<wl_shm> shm_; |
| 74 wl::Object<xdg_shell> shell_; | 74 wl::Object<xdg_shell> shell_; |
| 75 | 75 |
| 76 scoped_ptr<WaylandPointer> pointer_; | 76 std::unique_ptr<WaylandPointer> pointer_; |
| 77 | 77 |
| 78 bool scheduled_flush_ = false; | 78 bool scheduled_flush_ = false; |
| 79 bool watching_ = false; | 79 bool watching_ = false; |
| 80 base::MessagePumpLibevent::FileDescriptorWatcher controller_; | 80 base::MessagePumpLibevent::FileDescriptorWatcher controller_; |
| 81 | 81 |
| 82 DISALLOW_COPY_AND_ASSIGN(WaylandDisplay); | 82 DISALLOW_COPY_AND_ASSIGN(WaylandDisplay); |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 } // namespace ui | 85 } // namespace ui |
| 86 | 86 |
| 87 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ | 87 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_DISPLAY_H_ |
| OLD | NEW |