chromeos: wireup more display management for mushrome

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"
@@ skipping 31 matching lines @@
 #include "ash/wm/maximize_mode/maximize_mode_event_handler.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_cycle_event_filter.h"
 #include "ash/wm/window_cycle_event_filter_aura.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
+#include "ash/wm_display_observer.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/mus/window_tree_host_mus_init_params.h"
@@ skipping 90 matching lines @@
       return root_window_controller;
   }
   return nullptr;
 }
 
 aura::WindowTreeClient* ShellPortMash::window_tree_client() {
   return window_manager_->window_tree_client();
 }
 
 void ShellPortMash::Shutdown() {
+  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)
     Shell::Get()->window_tree_host_manager()->Shutdown();
   else
     window_manager_->DeleteAllRootWindowControllers();
@@ skipping 21 matching lines @@
   }
   RootWindowController* root_window_controller =
       GetRootWindowControllerWithDisplayId(display_id);
   return root_window_controller
              ? WmWindow::Get(root_window_controller->GetRootWindow())
              : nullptr;
 }
 
 const display::ManagedDisplayInfo& ShellPortMash::GetDisplayInfo(
     int64_t display_id) const {
+  // TODO(sky): mash should use this too http://crbug.com/718860.
+  if (GetAshConfig() == Config::MUS)
+    return Shell::Get()->display_manager()->GetDisplayInfo(display_id);
+
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
   static display::ManagedDisplayInfo fake_info;
   return fake_info;
 }
 
 bool ShellPortMash::IsActiveDisplayId(int64_t display_id) const {
+  // TODO(sky): mash should use this too http://crbug.com/718860.
+  if (GetAshConfig() == Config::MUS)
+    return Shell::Get()->display_manager()->IsActiveDisplayId(display_id);
+
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
   return true;
 }
 
 display::Display ShellPortMash::GetFirstDisplay() const {
+  // TODO(sky): mash should use this too http://crbug.com/718860.
+  if (GetAshConfig() == Config::MUS) {
+    return Shell::Get()
+        ->display_manager()
+        ->software_mirroring_display_list()[0];
+  }
+
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
   return display::Screen::GetScreen()->GetPrimaryDisplay();
 }
 
 bool ShellPortMash::IsInUnifiedMode() const {
+  // TODO(sky): mash should use this too http://crbug.com/718860.
+  if (GetAshConfig() == Config::MUS)
+    return Shell::Get()->display_manager()->IsInUnifiedMode();
+
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
   return false;
 }
 
 bool ShellPortMash::IsInUnifiedModeIgnoreMirroring() const {
+  // TODO(sky): mash should use this too http://crbug.com/718860.
+  if (GetAshConfig() == Config::MUS) {
+    return Shell::Get()
+               ->display_manager()
+               ->current_default_multi_display_mode() ==
+           display::DisplayManager::UNIFIED;
+  }
+
   // TODO(mash): implement http://crbug.com/622480.
   NOTIMPLEMENTED();
   return false;
 }
 
 void ShellPortMash::SetDisplayWorkAreaInsets(WmWindow* window,
                                              const gfx::Insets& insets) {
   if (GetAshConfig() == Config::MUS) {
     Shell::Get()
         ->window_tree_host_manager()
@@ skipping 142 matching lines @@
   NOTIMPLEMENTED();
   return std::unique_ptr<KeyEventWatcher>();
 }
 
 SessionStateDelegate* ShellPortMash::GetSessionStateDelegate() {
   return session_state_delegate_ ? session_state_delegate_.get()
                                  : Shell::Get()->session_state_delegate();
 }
 
 void ShellPortMash::AddDisplayObserver(WmDisplayObserver* observer) {
-  // TODO: need WmDisplayObserver support for mus. http://crbug.com/705831.
-  NOTIMPLEMENTED();
+  // TODO(sky): mash should use the same code as mus/classic and
+  // WmDisplayObserver should be removed; http://crbug.com/718860.
+  if (GetAshConfig() == Config::MASH) {
+    NOTIMPLEMENTED();
+    return;
+  }
+  if (!added_display_observer_) {
+    added_display_observer_ = true;
+    Shell::Get()->window_tree_host_manager()->AddObserver(this);
+  }
+  display_observers_.AddObserver(observer);
 }
 
 void ShellPortMash::RemoveDisplayObserver(WmDisplayObserver* observer) {
-  // TODO: need WmDisplayObserver support for mus. http://crbug.com/705831.
-  NOTIMPLEMENTED();
+  // TODO(sky): mash should use the same code as mus/classic and
+  // WmDisplayObserver should be removed; http://crbug.com/718860.
+  if (GetAshConfig() == Config::MASH) {
+    NOTIMPLEMENTED();
+    return;
+  }
+  display_observers_.RemoveObserver(observer);
 }
 
 void ShellPortMash::AddPointerWatcher(views::PointerWatcher* watcher,
                                       views::PointerWatcherEventTypes events) {
   if (GetAshConfig() == Config::MUS) {
     mus_state_->pointer_watcher_adapter->AddPointerWatcher(watcher, events);
     return;
   }
 
   // TODO: implement drags for mus pointer watcher, http://crbug.com/641164.
@@ skipping 156 matching lines @@
   mash_state_->accelerator_controller_delegate =
       base::MakeUnique<AcceleratorControllerDelegateMus>(window_manager_);
   mash_state_->accelerator_controller_registrar =
       base ::MakeUnique<AcceleratorControllerRegistrar>(
           window_manager_, accelerator_namespace_id);
   return base::MakeUnique<AcceleratorController>(
       mash_state_->accelerator_controller_delegate.get(),
       mash_state_->accelerator_controller_registrar.get());
 }
 
+void ShellPortMash::OnDisplayConfigurationChanging() {
+  for (auto& observer : display_observers_)
+    observer.OnDisplayConfigurationChanging();
+}
+
+void ShellPortMash::OnDisplayConfigurationChanged() {
+  for (auto& observer : display_observers_)
+    observer.OnDisplayConfigurationChanged();
+}
+
 }  // namespace mus
 }  // namespace ash