Enables ScreenPinningController for mash/mus

ash/common/wm/maximize_mode/maximize_mode_window_state.cc

 // Copyright 2014 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/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_state_util.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
-#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shell.h"
+#include "ash/wm/screen_pinning_controller.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 namespace {
 
 // Returns the biggest possible size for a window which is about to be
 // maximized.
 gfx::Size GetMaximumSizeOfWindow(wm::WindowState* window_state) {
   DCHECK(window_state->CanMaximize() || window_state->CanResize());
@@ skipping 94 matching lines @@
 void MaximizeModeWindowState::OnWMEvent(wm::WindowState* window_state,
                                         const wm::WMEvent* event) {
   switch (event->type()) {
     case wm::WM_EVENT_TOGGLE_FULLSCREEN:
       ToggleFullScreen(window_state, window_state->delegate());
       break;
     case wm::WM_EVENT_FULLSCREEN:
       UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN, true);
       break;
     case wm::WM_EVENT_PIN:
-      if (!WmShell::Get()->IsPinned())
+      if (!Shell::Get()->screen_pinning_controller()->IsPinned())
         UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_PINNED, true);
       break;
     case wm::WM_EVENT_TRUSTED_PIN:
-      if (!WmShell::Get()->IsPinned())
+      if (!Shell::Get()->screen_pinning_controller()->IsPinned())
         UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_TRUSTED_PINNED, true);
       break;
     case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION:
     case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE:
     case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE:
     case wm::WM_EVENT_TOGGLE_MAXIMIZE:
     case wm::WM_EVENT_CYCLE_SNAP_LEFT:
     case wm::WM_EVENT_CYCLE_SNAP_RIGHT:
     case wm::WM_EVENT_CENTER:
     case wm::WM_EVENT_SNAP_LEFT:
@@ skipping 128 matching lines @@
   } else {
     UpdateBounds(window_state, animated);
   }
 
   window_state->NotifyPostStateTypeChange(old_state_type);
 
   if (old_state_type == wm::WINDOW_STATE_TYPE_PINNED ||
       target_state == wm::WINDOW_STATE_TYPE_PINNED ||
       old_state_type == wm::WINDOW_STATE_TYPE_TRUSTED_PINNED ||
       target_state == wm::WINDOW_STATE_TYPE_TRUSTED_PINNED) {
-    WmShell::Get()->SetPinnedWindow(window_state->window());
+    Shell::Get()->screen_pinning_controller()->SetPinnedWindow(
+        window_state->window());
   }
 
   if ((window_state->window()->GetTargetVisibility() ||
        old_state_type == wm::WINDOW_STATE_TYPE_MINIMIZED) &&
       !window_state->window()->GetLayer()->visible()) {
     // The layer may be hidden if the window was previously minimized. Make
     // sure it's visible.
     window_state->window()->Show();
   }
 }
@@ skipping 21 matching lines @@
       // avoid flashing.
       if (window_state->IsMaximized())
         window_state->SetBoundsDirectCrossFade(bounds_in_parent);
       else
         window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 }
 
 }  // namespace ash