chromeos: changes how DisplayManagerObservers are notified

ash/mus/bridge/shell_port_mash.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/bridge/shell_port_mash.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/aura/key_event_watcher_aura.h"
 #include "ash/aura/pointer_watcher_adapter.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/key_event_watcher.h"
 #include "ash/laser/laser_pointer_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
 #include "ash/mus/ash_window_tree_host_mus.h"
 #include "ash/mus/bridge/immersive_handler_factory_mus.h"
 #include "ash/mus/bridge/workspace_event_handler_mus.h"
+#include "ash/mus/display_synchronizer.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/keyboard_ui_mus.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/touch_transform_setter_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/session/session_state_delegate.h"
@@ skipping 121 matching lines @@
       return root_window_controller;
   }
   return nullptr;
 }
 
 aura::WindowTreeClient* ShellPortMash::window_tree_client() {
   return window_manager_->window_tree_client();
 }
 
 void ShellPortMash::Shutdown() {
+  display_synchronizer_.reset();
+
   if (added_display_observer_)
     Shell::Get()->window_tree_host_manager()->RemoveObserver(this);
 
   if (mus_state_)
     mus_state_->pointer_watcher_adapter.reset();
 
   ShellPort::Shutdown();
 
   // TODO(sky): Config::MASH should use WindowTreeHostManager too.
   if (GetAshConfig() == Config::MUS)
@@ skipping 344 matching lines @@
   // In Config::MUS PointerWatcherAdapter must be created when this function is
   // called (it is order dependent), that is not the case with Config::MASH.
   if (GetAshConfig() == Config::MUS) {
     mus_state_->pointer_watcher_adapter =
         base::MakeUnique<PointerWatcherAdapter>();
   }
 }
 
 std::unique_ptr<AshWindowTreeHost> ShellPortMash::CreateAshWindowTreeHost(
     const AshWindowTreeHostInitParams& init_params) {
-  // TODO(sky): make this work for mash too.
-  if (GetAshConfig() != Config::MUS)
+  if (!Shell::ShouldEnableSimplifiedDisplayManagement())
     return nullptr;
 
   std::unique_ptr<aura::DisplayInitParams> display_params =
       base::MakeUnique<aura::DisplayInitParams>();
   display_params->viewport_metrics.bounds_in_pixels =
       init_params.initial_bounds;
   display_params->viewport_metrics.device_scale_factor =
       init_params.device_scale_factor;
   display_params->viewport_metrics.ui_scale_factor =
       init_params.ui_scale_factor;
   display::Display mirrored_display =
       Shell::Get()->display_manager()->GetMirroringDisplayById(
           init_params.display_id);
   if (mirrored_display.is_valid()) {
     display_params->display =
         base::MakeUnique<display::Display>(mirrored_display);
   }
-  // TODO: wire update is_primary_display correctly.
   display_params->is_primary_display = true;
   aura::WindowTreeHostMusInitParams aura_init_params =
       window_manager_->window_manager_client()->CreateInitParamsForNewDisplay();
   aura_init_params.display_id = init_params.display_id;
   aura_init_params.display_init_params = std::move(display_params);
   aura_init_params.use_classic_ime = !Shell::ShouldUseIMEService();
   return base::MakeUnique<AshWindowTreeHostMus>(std::move(aura_init_params));
 }
 
 void ShellPortMash::OnCreatedRootWindowContainers(
@@ skipping 11 matching lines @@
   if (GetAshConfig() == Config::MASH)
     return;
 
   DCHECK_EQ(Config::MUS, GetAshConfig());
   Shell::Get()->window_tree_host_manager()->Start();
   AshWindowTreeHostInitParams ash_init_params;
   Shell::Get()->window_tree_host_manager()->CreatePrimaryHost(ash_init_params);
 }
 
 void ShellPortMash::InitHosts(const ShellInitParams& init_params) {
-  if (GetAshConfig() == Config::MUS) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
     Shell::Get()->window_tree_host_manager()->InitHosts();
+    display_synchronizer_ = base::MakeUnique<DisplaySynchronizer>(
+        window_manager_->window_manager_client());
   } else {
     window_manager_->CreatePrimaryRootWindowController(
         base::WrapUnique(init_params.primary_window_tree_host));
   }
 }
 
 std::unique_ptr<display::NativeDisplayDelegate>
 ShellPortMash::CreateNativeDisplayDelegate() {
 #if defined(USE_OZONE)
   display::mojom::NativeDisplayDelegatePtr native_display_delegate;
@@ skipping 44 matching lines @@
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortMash::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace mus
 }  // namespace ash