Folds methods in WmShellCommon to WmShell

ash/wm/screen_pinning_controller.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/wm/screen_pinning_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm_shell_common.h"
+#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_observer.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/dim_window.h"
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/aura/window_observer.h"
 
 namespace ash {
 namespace {
 
 WmWindow* CreateDimWindow(WmWindow* container) {
   DimWindow* dim_window = new DimWindow(WmWindowAura::GetAuraWindow(container));
   dim_window->SetDimOpacity(1);  // Set whole black.
   WmWindow* result = WmWindowAura::Get(dim_window);
   result->SetFullscreen();
   result->Show();
   return result;
 }
 
 // Returns a list of WmWindows corresponding to SystemModalContainers,
 // except ones whose root is shared with |pinned_window|.
 std::vector<WmWindow*> GetSystemModalWindowsExceptPinned(
     WmWindow* pinned_window) {
   WmWindow* pinned_root = pinned_window->GetRootWindow();
 
   std::vector<WmWindow*> result;
-  for (WmWindow* system_modal : WmWindowAura::FromAuraWindows(
-           ash::Shell::GetContainersFromAllRootWindows(
-               kShellWindowId_SystemModalContainer, nullptr))) {
+  for (WmWindow* system_modal :
+       WmWindowAura::FromAuraWindows(Shell::GetContainersFromAllRootWindows(
+           kShellWindowId_SystemModalContainer, nullptr))) {
     if (system_modal->GetRootWindow() == pinned_root)
       continue;
     result.push_back(system_modal);
   }
   return result;
 }
 
 void AddObserverToChildren(WmWindow* container,
                            aura::WindowObserver* observer) {
   for (WmWindow* child : container->GetChildren()) {
@@ skipping 117 matching lines @@
   void OnWindowDestroying(aura::Window* window) override {
     controller_->OnDimWindowDestroying(WmWindowAura::Get(window));
   }
 
  private:
   ScreenPinningController* controller_;
   DISALLOW_COPY_AND_ASSIGN(DimWindowObserver);
 };
 
 ScreenPinningController::ScreenPinningController(
-    WmShellCommon* wm_shell_common,
     WindowTreeHostManager* window_tree_host_manager)
-    : wm_shell_common_(wm_shell_common),
-      window_tree_host_manager_(window_tree_host_manager),
+    : window_tree_host_manager_(window_tree_host_manager),
       pinned_container_window_observer_(
           new PinnedContainerWindowObserver(this)),
       pinned_container_child_window_observer_(
           new PinnedContainerChildWindowObserver(this)),
       system_modal_container_window_observer_(
           new SystemModalContainerWindowObserver(this)),
       system_modal_container_child_window_observer_(
           new SystemModalContainerChildWindowObserver(this)),
       dim_window_observer_(new DimWindowObserver(this)) {
   window_tree_host_manager_->AddObserver(this);
@@ skipping 77 matching lines @@
     for (WmWindow* dim_window : std::vector<WmWindow*>(dim_windows_)) {
       delete WmWindowAura::GetAuraWindow(dim_window);
     }
     DCHECK(dim_windows_.empty());
     delete WmWindowAura::GetAuraWindow(background_window_);
     background_window_ = nullptr;
 
     pinned_window_ = nullptr;
   }
 
-  wm_shell_common_->NotifyPinnedStateChanged(pinned_window);
+  WmShell::Get()->NotifyPinnedStateChanged(pinned_window);
 }
 
 void ScreenPinningController::OnWindowAddedToPinnedContainer(
     WmWindow* new_window) {
   KeepPinnedWindowOnTop();
   WmWindowAura::GetAuraWindow(new_window)
       ->AddObserver(pinned_container_child_window_observer_.get());
 }
 
 void ScreenPinningController::OnWillRemoveWindowFromPinnedContainer(
@@ skipping 99 matching lines @@
   base::AutoReset<bool> auto_reset(&in_restacking_, true);
   for (WmWindow* dim_window : dim_windows_) {
     if (dim_window->GetParent() == container) {
       container->StackChildAtBottom(dim_window);
       break;
     }
   }
 }
 
 }  // namespace ash