Moves WindowSelectorController onto WmShell

ash/desktop_background/desktop_background_view.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/desktop_background/desktop_background_view.h"
 
 #include <limits>
 
 #include "ash/ash_export.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm_shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 62 matching lines @@
 class PreEventDispatchHandler : public ui::EventHandler {
  public:
   PreEventDispatchHandler() {}
   ~PreEventDispatchHandler() override {}
 
  private:
   // ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* event) override {
     CHECK_EQ(ui::EP_PRETARGET, event->phase());
     WindowSelectorController* controller =
-        Shell::GetInstance()->window_selector_controller();
+        WmShell::Get()->window_selector_controller();
     if (event->type() == ui::ET_MOUSE_RELEASED && controller->IsSelecting()) {
       controller->ToggleOverview();
       event->StopPropagation();
     }
   }
 
   void OnGestureEvent(ui::GestureEvent* event) override {
     CHECK_EQ(ui::EP_PRETARGET, event->phase());
     WindowSelectorController* controller =
-        Shell::GetInstance()->window_selector_controller();
+        WmShell::Get()->window_selector_controller();
     if (event->type() == ui::ET_GESTURE_TAP && controller->IsSelecting()) {
       controller->ToggleOverview();
       event->StopPropagation();
     }
   }
 
   DISALLOW_COPY_AND_ASSIGN(PreEventDispatchHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 134 matching lines @@
     // Disable animation if transition to login screen from an empty background.
     ::wm::SetWindowVisibilityAnimationTransition(
         desktop_widget->GetNativeView(), ::wm::ANIMATE_NONE);
   }
 
   desktop_widget->SetBounds(params.parent->bounds());
   return desktop_widget;
 }
 
 }  // namespace ash