chromeos: turn on simplified display management for mash

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 151 matching lines @@
 
 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)
+  if (Shell::ShouldEnableSimplifiedDisplayManagement())
     Shell::Get()->window_tree_host_manager()->Shutdown();
   else
     window_manager_->DeleteAllRootWindowControllers();
 }
 
 Config ShellPortMash::GetAshConfig() const {
   return window_manager_->config();
 }
 
 aura::Window* ShellPortMash::GetPrimaryRootWindow() {
-  if (GetAshConfig() == Config::MUS)
+  if (Shell::ShouldEnableSimplifiedDisplayManagement())
     return Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow();
   // NOTE: This is called before the RootWindowController has been created, so
   // it can't call through to RootWindowController to get all windows.
   return primary_root_window_;
 }
 
 aura::Window* ShellPortMash::GetRootWindowForDisplayId(int64_t display_id) {
-  if (GetAshConfig() == Config::MUS) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
     return Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
         display_id);
   }
   RootWindowController* root_window_controller =
       GetRootWindowControllerWithDisplayId(display_id);
   return root_window_controller ? 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)
+  if (Shell::ShouldEnableSimplifiedDisplayManagement())
     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)
+  if (Shell::ShouldEnableSimplifiedDisplayManagement())
     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) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
     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)
+  if (Shell::ShouldEnableSimplifiedDisplayManagement())
     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) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
     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) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
     Shell::Get()
         ->window_tree_host_manager()
         ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets);
     return;
   }
   window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets);
 }
 
 std::unique_ptr<display::TouchTransformSetter>
 ShellPortMash::CreateTouchTransformDelegate() {
@@ skipping 23 matching lines @@
       std::move(cursor));
 }
 
 bool ShellPortMash::IsMouseEventsEnabled() {
   // TODO: http://crbug.com/637853
   NOTIMPLEMENTED();
   return true;
 }
 
 std::vector<WmWindow*> ShellPortMash::GetAllRootWindows() {
-  if (GetAshConfig() == Config::MUS) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
     aura::Window::Windows root_windows =
         Shell::Get()->window_tree_host_manager()->GetAllRootWindows();
     std::vector<WmWindow*> wm_windows(root_windows.size());
     for (size_t i = 0; i < root_windows.size(); ++i)
       wm_windows[i] = WmWindow::Get(root_windows[i]);
     return wm_windows;
   }
   std::vector<WmWindow*> root_windows;
   for (RootWindowController* root_window_controller :
        RootWindowController::root_window_controllers()) {
@@ skipping 56 matching lines @@
     return base::MakeUnique<wm::MaximizeModeEventHandlerAura>();
 
   // TODO: need support for window manager to get events before client:
   // http://crbug.com/624157.
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
 ShellPortMash::CreateScopedDisableInternalMouseAndKeyboard() {
-  if (GetAshConfig() == Config::MUS) {
+  if (Shell::ShouldEnableSimplifiedDisplayManagement()) {
 #if defined(USE_OZONE)
     return base::MakeUnique<ScopedDisableInternalMouseAndKeyboardOzone>();
 #else
     // TODO: remove this conditional. Bots build this config, but it is never
     // actually used. http://crbug.com/671355.
     NOTREACHED();
     return nullptr;
 #endif
   }
 
@@ skipping 31 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(sky): mash should use the same code as mus/classic and
-  // WmDisplayObserver should be removed; http://crbug.com/718860.
-  if (GetAshConfig() == Config::MASH) {
+  // TODO(sky): WmDisplayObserver should be removed; http://crbug.com/718860.
+  if (!Shell::ShouldEnableSimplifiedDisplayManagement()) {
     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(sky): mash should use the same code as mus/classic and
-  // WmDisplayObserver should be removed; http://crbug.com/718860.
-  if (GetAshConfig() == Config::MASH) {
+  // TODO(sky): WmDisplayObserver should be removed; http://crbug.com/718860.
+  if (!Shell::ShouldEnableSimplifiedDisplayManagement()) {
     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);
@@ skipping 55 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;
@@ skipping 19 matching lines @@
   // TODO: To avoid lots of IPC AddActivationParent() should take an array.
   // http://crbug.com/682048.
   aura::Window* root_window = root_window_controller->GetRootWindow();
   for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
     window_manager_->window_manager_client()->AddActivationParent(
         root_window->GetChildById(kActivatableShellWindowIds[i]));
   }
 }
 
 void ShellPortMash::CreatePrimaryHost() {
-  if (GetAshConfig() == Config::MASH)
+  if (!Shell::ShouldEnableSimplifiedDisplayManagement())
     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();
   } else {
     window_manager_->CreatePrimaryRootWindowController(
         base::WrapUnique(init_params.primary_window_tree_host));
   }
 }
 
 std::unique_ptr<display::NativeDisplayDelegate>
 ShellPortMash::CreateNativeDisplayDelegate() {
 #if defined(USE_OZONE)
@@ skipping 45 matching lines @@
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortMash::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace mus
 }  // namespace ash