WIP: simplified display management in ash

services/ui/display/screen_manager_forwarding.cc

Index: services/ui/display/screen_manager_forwarding.cc
diff --git a/services/ui/display/screen_manager_forwarding.cc b/services/ui/display/screen_manager_forwarding.cc
index c218d27924d123ae45176d0b7bfa1a418f39b40f..00b8677a7944ff66dca5dcac9e451cc508feab50 100644
--- a/services/ui/display/screen_manager_forwarding.cc
+++ b/services/ui/display/screen_manager_forwarding.cc
@@ -37,15 +37,19 @@ const DisplayMode* GetCorrespondingMode(const DisplaySnapshot& snapshot,
 }  // namespace
 
 ScreenManagerForwarding::ScreenManagerForwarding()
-    : screen_(base::MakeUnique<display::ScreenBase>()), binding_(this) {}
+    : screen_(base::MakeUnique<display::ScreenBase>()), binding_(this) {
+  Screen::SetScreenInstance(screen_.get());
+}
 
 ScreenManagerForwarding::~ScreenManagerForwarding() {
   if (native_display_delegate_)
     native_display_delegate_->RemoveObserver(this);
+  Screen::SetScreenInstance(nullptr);
 }
 
 void ScreenManagerForwarding::AddInterfaces(
     service_manager::BinderRegistry* registry) {
+  // registry->AddInterface<mojom::DisplayController>(this);
   registry->AddInterface<mojom::NativeDisplayDelegate>(this);
 }