Enables ScreenPinningController for mash/mus

ash/common/wm/workspace/workspace_layout_manager.cc

 // Copyright (c) 2012 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/common/wm/workspace/workspace_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/common/keyboard/keyboard_observer_register.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/fullscreen_window_finder.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
+#include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
@@ skipping 44 matching lines @@
   wm::WMEvent event(wm::WM_EVENT_ADDED_TO_WORKSPACE);
   window_state->OnWMEvent(&event);
   windows_.insert(child);
   child->aura_window()->AddObserver(this);
   window_state->AddObserver(this);
   UpdateShelfVisibility();
   UpdateFullscreenState();
   if (backdrop_delegate_)
     backdrop_delegate_->OnWindowAddedToLayout(child);
   WindowPositioner::RearrangeVisibleWindowOnShow(child);
-  if (WmShell::Get()->IsPinned())
+  if (Shell::Get()->screen_pinning_controller()->IsPinned())
     child->GetWindowState()->DisableAlwaysOnTop(nullptr);
 }
 
 void WorkspaceLayoutManager::OnWillRemoveWindowFromLayout(WmWindow* child) {
   windows_.erase(child);
   child->aura_window()->RemoveObserver(this);
   child->GetWindowState()->RemoveObserver(this);
 
   if (child->GetTargetVisibility())
     WindowPositioner::RearrangeVisibleWindowOnHideOrRemove(child);
@@ skipping 202 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, ShellObserver implementation:
 
 void WorkspaceLayoutManager::OnFullscreenStateChanged(bool is_fullscreen,
                                                       WmWindow* root_window) {
   if (root_window != root_window_ || is_fullscreen_ == is_fullscreen)
     return;
 
   is_fullscreen_ = is_fullscreen;
-  if (WmShell::Get()->IsPinned()) {
+  if (Shell::Get()->screen_pinning_controller()->IsPinned()) {
     // If this is in pinned mode, then this event does not trigger the
     // always-on-top state change, because it is kept disabled regardless of
     // the fullscreen state change.
     return;
   }
 
   UpdateAlwaysOnTop(is_fullscreen_ ? wm::GetWindowForFullscreenMode(window_)
                                    : nullptr);
 }
 
 void WorkspaceLayoutManager::OnPinnedStateChanged(WmWindow* pinned_window) {
-  if (!WmShell::Get()->IsPinned() && is_fullscreen_) {
+  const bool is_pinned = Shell::Get()->screen_pinning_controller()->IsPinned();
+  if (!is_pinned && is_fullscreen_) {
     // On exiting from pinned mode, if the workspace is still in fullscreen
     // mode, then this event does not trigger the restoring yet. On exiting
     // from fullscreen, the temporarily disabled always-on-top property will be
     // restored.
     return;
   }
 
-  UpdateAlwaysOnTop(WmShell::Get()->IsPinned() ? pinned_window : nullptr);
+  UpdateAlwaysOnTop(is_pinned ? pinned_window : nullptr);
 }
 
 void WorkspaceLayoutManager::OnVirtualKeyboardStateChanged(
     bool activated,
     WmWindow* root_window) {
   UpdateKeyboardObserverFromStateChanged(activated, root_window, root_window_,
                                          &keyboard_observer_);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ skipping 52 matching lines @@
   for (auto* window : windows) {
     wm::WindowState* window_state = window->GetWindowState();
     if (window_on_top)
       window_state->DisableAlwaysOnTop(window_on_top);
     else
       window_state->RestoreAlwaysOnTop();
   }
 }
 
 }  // namespace ash