| 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_SCREEN_MANAGER_OZONE_H_ | 5 #ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_ |
| 6 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_ | 6 #define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "ui/display/display_observer.h" | 21 #include "ui/display/display_observer.h" |
| 22 #include "ui/display/manager/chromeos/display_configurator.h" | 22 #include "ui/display/manager/chromeos/display_configurator.h" |
| 23 #include "ui/display/manager/display_manager.h" | 23 #include "ui/display/manager/display_manager.h" |
| 24 #include "ui/display/types/display_constants.h" | 24 #include "ui/display/types/display_constants.h" |
| 25 | 25 |
| 26 namespace display { | 26 namespace display { |
| 27 | 27 |
| 28 class DisplayChangeObserver; | 28 class DisplayChangeObserver; |
| 29 class FakeDisplayController; | 29 class FakeDisplayController; |
| 30 class ScreenBase; | 30 class ScreenBase; |
| 31 class TouchTransformController; |
| 31 | 32 |
| 32 // ScreenManagerOzone provides the necessary functionality to configure all | 33 // ScreenManagerOzone provides the necessary functionality to configure all |
| 33 // attached physical displays on the ozone platform. | 34 // attached physical displays on the ozone platform. |
| 34 class ScreenManagerOzone | 35 class ScreenManagerOzone |
| 35 : public ScreenManager, | 36 : public ScreenManager, |
| 36 public mojom::TestDisplayController, | 37 public mojom::TestDisplayController, |
| 37 public mojom::DisplayController, | 38 public mojom::DisplayController, |
| 38 public DisplayObserver, | 39 public DisplayObserver, |
| 39 public DisplayManager::Delegate, | 40 public DisplayManager::Delegate, |
| 40 public service_manager::InterfaceFactory<mojom::DisplayController>, | 41 public service_manager::InterfaceFactory<mojom::DisplayController>, |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 void Create(const service_manager::Identity& remote_identity, | 90 void Create(const service_manager::Identity& remote_identity, |
| 90 mojom::DisplayControllerRequest request) override; | 91 mojom::DisplayControllerRequest request) override; |
| 91 | 92 |
| 92 // mojo::InterfaceFactory<mojom::TestDisplayController>: | 93 // mojo::InterfaceFactory<mojom::TestDisplayController>: |
| 93 void Create(const service_manager::Identity& remote_identity, | 94 void Create(const service_manager::Identity& remote_identity, |
| 94 mojom::TestDisplayControllerRequest request) override; | 95 mojom::TestDisplayControllerRequest request) override; |
| 95 | 96 |
| 96 DisplayConfigurator display_configurator_; | 97 DisplayConfigurator display_configurator_; |
| 97 std::unique_ptr<DisplayManager> display_manager_; | 98 std::unique_ptr<DisplayManager> display_manager_; |
| 98 std::unique_ptr<DisplayChangeObserver> display_change_observer_; | 99 std::unique_ptr<DisplayChangeObserver> display_change_observer_; |
| 100 std::unique_ptr<TouchTransformController> touch_transform_controller_; |
| 99 | 101 |
| 100 ScreenBase* screen_ = nullptr; | 102 ScreenBase* screen_ = nullptr; |
| 101 ScreenManagerDelegate* delegate_ = nullptr; | 103 ScreenManagerDelegate* delegate_ = nullptr; |
| 102 | 104 |
| 103 std::unique_ptr<NativeDisplayDelegate> native_display_delegate_; | 105 std::unique_ptr<NativeDisplayDelegate> native_display_delegate_; |
| 104 | 106 |
| 105 // If not null it provides a way to modify the display state when running off | 107 // If not null it provides a way to modify the display state when running off |
| 106 // device (eg. running mustash on Linux). | 108 // device (eg. running mustash on Linux). |
| 107 FakeDisplayController* fake_display_controller_ = nullptr; | 109 FakeDisplayController* fake_display_controller_ = nullptr; |
| 108 | 110 |
| 109 int64_t primary_display_id_ = kInvalidDisplayId; | 111 int64_t primary_display_id_ = kInvalidDisplayId; |
| 110 | 112 |
| 111 mojo::BindingSet<mojom::DisplayController> controller_bindings_; | 113 mojo::BindingSet<mojom::DisplayController> controller_bindings_; |
| 112 mojo::BindingSet<mojom::TestDisplayController> test_bindings_; | 114 mojo::BindingSet<mojom::TestDisplayController> test_bindings_; |
| 113 | 115 |
| 114 DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzone); | 116 DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzone); |
| 115 }; | 117 }; |
| 116 | 118 |
| 117 } // namespace display | 119 } // namespace display |
| 118 | 120 |
| 119 #endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_ | 121 #endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_ |
| OLD | NEW |