| 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 SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ | 5 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ |
| 6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ | 6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 | 74 |
| 75 const int64_t display_id_; | 75 const int64_t display_id_; |
| 76 | 76 |
| 77 #if !defined(OS_ANDROID) | 77 #if !defined(OS_ANDROID) |
| 78 std::unique_ptr<ui::ImageCursors> image_cursors_; | 78 std::unique_ptr<ui::ImageCursors> image_cursors_; |
| 79 #endif | 79 #endif |
| 80 | 80 |
| 81 PlatformDisplayDelegate* delegate_ = nullptr; | 81 PlatformDisplayDelegate* delegate_ = nullptr; |
| 82 std::unique_ptr<FrameGenerator> frame_generator_; | 82 std::unique_ptr<FrameGenerator> frame_generator_; |
| 83 | 83 |
| 84 // Fix X11 event positions when the window gets resized. |
| 85 int window_height_offset_ = 0; |
| 86 |
| 84 display::ViewportMetrics metrics_; | 87 display::ViewportMetrics metrics_; |
| 85 std::unique_ptr<ui::PlatformWindow> platform_window_; | 88 std::unique_ptr<ui::PlatformWindow> platform_window_; |
| 86 gfx::AcceleratedWidget widget_; | 89 gfx::AcceleratedWidget widget_; |
| 87 | 90 |
| 88 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault); | 91 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault); |
| 89 }; | 92 }; |
| 90 | 93 |
| 91 } // namespace ws | 94 } // namespace ws |
| 92 } // namespace ui | 95 } // namespace ui |
| 93 | 96 |
| 94 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ | 97 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ |
| OLD | NEW |