chromeos: cleans up display related mojoms
This removes the mojom interfaces DevDisplayController and DisplayController which
are unused. OutputProtection is still necessary. As OutputProtection is now provided
by ash, OutputProtection has been moved to ash. Additionally, OutputProtection has
been renamed to DisplayOutputProtection. OutputProtection was previously in the
display namespace, so that renaming to DisplayOutputProtection makes it more
obvious what the class is for.
BUG=842365
TEST=none
Change-Id: I1f469032fc991139964b04b9740da64abafa89e0
Reviewed-on: https://chromium-review.googlesource.com/1183892
Reviewed-by: Tom Sepez <[email protected]>
Reviewed-by: kylechar <[email protected]>
Commit-Queue: Scott Violet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#585215}diff --git a/ash/shell.h b/ash/shell.h
index 582216dd..11a023d1 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -108,6 +108,7 @@
class BrightnessControlDelegate;
class CastConfigController;
class ClientImageRegistry;
+class DisplayOutputProtection;
class CrosDisplayConfig;
class DetachableBaseHandler;
class DetachableBaseNotificationController;
@@ -395,6 +396,9 @@
DisplayErrorObserver* display_error_observer() {
return display_error_observer_.get();
}
+ DisplayOutputProtection* display_output_protection() {
+ return display_output_protection_.get();
+ }
DockedMagnifierController* docked_magnifier_controller();
aura::Env* aura_env() { return aura_env_; }
@@ -847,6 +851,7 @@
std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
// Controls video output device state.
std::unique_ptr<display::DisplayConfigurator> display_configurator_;
+ std::unique_ptr<DisplayOutputProtection> display_output_protection_;
std::unique_ptr<DisplayColorManager> display_color_manager_;
std::unique_ptr<DisplayErrorObserver> display_error_observer_;
std::unique_ptr<ProjectingObserver> projecting_observer_;
