| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 #if !defined(OS_ANDROID) | 71 #if !defined(OS_ANDROID) |
| 72 std::unique_ptr<ui::ImageCursors> image_cursors_; | 72 std::unique_ptr<ui::ImageCursors> image_cursors_; |
| 73 #endif | 73 #endif |
| 74 | 74 |
| 75 PlatformDisplayDelegate* delegate_ = nullptr; | 75 PlatformDisplayDelegate* delegate_ = nullptr; |
| 76 std::unique_ptr<FrameGenerator> frame_generator_; | 76 std::unique_ptr<FrameGenerator> frame_generator_; |
| 77 | 77 |
| 78 display::ViewportMetrics metrics_; | 78 display::ViewportMetrics metrics_; |
| 79 std::unique_ptr<ui::PlatformWindow> platform_window_; | 79 std::unique_ptr<ui::PlatformWindow> platform_window_; |
| 80 gfx::AcceleratedWidget widget_; | 80 gfx::AcceleratedWidget widget_; |
| 81 float init_device_scale_factor_; | |
| 82 | 81 |
| 83 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault); | 82 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault); |
| 84 }; | 83 }; |
| 85 | 84 |
| 86 } // namespace ws | 85 } // namespace ws |
| 87 } // namespace ui | 86 } // namespace ui |
| 88 | 87 |
| 89 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ | 88 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ |
| OLD | NEW |