| 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_DISPLAY_PLATFORM_SCREEN_OZONE_H_ | 5 #ifndef SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_ |
| 6 #define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_ | 6 #define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 void ToggleAddRemoveDisplay() override; | 49 void ToggleAddRemoveDisplay() override; |
| 50 void ToggleDisplayResolution() override; | 50 void ToggleDisplayResolution() override; |
| 51 | 51 |
| 52 // mojom::DisplayController: | 52 // mojom::DisplayController: |
| 53 void SwapPrimaryDisplay() override; | 53 void SwapPrimaryDisplay() override; |
| 54 void SetDisplayWorkArea(int64_t display_id, | 54 void SetDisplayWorkArea(int64_t display_id, |
| 55 const gfx::Size& size, | 55 const gfx::Size& size, |
| 56 const gfx::Insets& insets) override; | 56 const gfx::Insets& insets) override; |
| 57 | 57 |
| 58 private: | 58 private: |
| 59 friend class PlatformScreenOzoneTest; |
| 60 |
| 59 // TODO(kylechar): This struct is just temporary until we migrate | 61 // TODO(kylechar): This struct is just temporary until we migrate |
| 60 // DisplayManager code out of ash so it can be used here. | 62 // DisplayManager code out of ash so it can be used here. |
| 61 struct DisplayInfo { | 63 struct DisplayInfo { |
| 62 DisplayInfo(); | 64 DisplayInfo(); |
| 63 DisplayInfo(const DisplayInfo& other); | 65 DisplayInfo(const DisplayInfo& other); |
| 64 ~DisplayInfo(); | 66 ~DisplayInfo(); |
| 65 | 67 |
| 66 int64_t id = Display::kInvalidDisplayID; | 68 int64_t id = Display::kInvalidDisplayID; |
| 67 // Information about display viewport. | 69 // Information about display viewport. |
| 68 ViewportMetrics metrics; | 70 ViewportMetrics metrics; |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 156 |
| 155 mojo::BindingSet<mojom::DisplayController> controller_bindings_; | 157 mojo::BindingSet<mojom::DisplayController> controller_bindings_; |
| 156 mojo::BindingSet<mojom::TestDisplayController> test_bindings_; | 158 mojo::BindingSet<mojom::TestDisplayController> test_bindings_; |
| 157 | 159 |
| 158 DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone); | 160 DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone); |
| 159 }; | 161 }; |
| 160 | 162 |
| 161 } // namespace display | 163 } // namespace display |
| 162 | 164 |
| 163 #endif // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_ | 165 #endif // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_ |
| OLD | NEW |