Enables ScreenPinningController for mash/mus

ash/common/wm/default_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/default_state.h"
 
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.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/root_window_controller.h"
+#include "ash/shell.h"
+#include "ash/wm/screen_pinning_controller.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 // This specifies how much percent (30%) of a window rect
 // must be visible when the window is added to the workspace.
 const float kMinimumPercentOnScreenArea = 0.3f;
@@ skipping 100 matching lines @@
       return;
     case WM_EVENT_SHOW_INACTIVE:
       next_state_type = WINDOW_STATE_TYPE_INACTIVE;
       break;
     case WM_EVENT_PIN:
     case WM_EVENT_TRUSTED_PIN:
       // If there already is a pinned window, it is not allowed to set it
       // to this window.
       // TODO(hidehiko): If a system modal window is openening, the pinning
       // probably should fail.
-      if (WmShell::Get()->IsPinned()) {
+      if (Shell::Get()->screen_pinning_controller()->IsPinned()) {
         LOG(ERROR) << "An PIN event will be failed since another window is "
                    << "already in pinned mode.";
         next_state_type = current_state_type;
       } else {
         next_state_type = event->type() == WM_EVENT_PIN
                               ? WINDOW_STATE_TYPE_PINNED
                               : WINDOW_STATE_TYPE_TRUSTED_PINNED;
       }
       break;
     case WM_EVENT_TOGGLE_MAXIMIZE_CAPTION:
@@ skipping 366 matching lines @@
       window_state->SetRestoreBoundsInScreen(restore_bounds_in_screen);
     else if (window_state->IsNormalStateType())
       window_state->ClearRestoreBounds();
   }
   window_state->NotifyPostStateTypeChange(previous_state_type);
 
   if (next_state_type == WINDOW_STATE_TYPE_PINNED ||
       previous_state_type == WINDOW_STATE_TYPE_PINNED ||
       next_state_type == WINDOW_STATE_TYPE_TRUSTED_PINNED ||
       previous_state_type == WINDOW_STATE_TYPE_TRUSTED_PINNED) {
-    WmShell::Get()->SetPinnedWindow(window_state->window());
+    Shell::Get()->screen_pinning_controller()->SetPinnedWindow(
+        window_state->window());
   }
 }
 
 void DefaultState::ReenterToCurrentState(
     WindowState* window_state,
     WindowState::State* state_in_previous_mode) {
   WindowStateType previous_state_type = state_in_previous_mode->GetType();
 
   // A state change should not move a window into or out of full screen or
   // pinned since these are "special mode" the user wanted to be in and
@@ skipping 148 matching lines @@
     gfx::Rect center_in_parent = GetDisplayWorkAreaBoundsInParent(window);
     center_in_parent.ClampToCenteredSize(window->GetBounds().size());
     window_state->SetBoundsDirectAnimated(center_in_parent);
   }
   // Centering window is treated as if a user moved and resized the window.
   window_state->set_bounds_changed_by_user(true);
 }
 
 }  // namespace wm
 }  // namespace ash