Moves maintaining ShellObservers back to Shell

ash/common/wm/overview/window_selector_controller.cc

 // Copyright 2013 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/overview/window_selector_controller.h"
 
 #include <vector>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/shell.h"
 #include "base/metrics/histogram_macros.h"
 
 namespace ash {
 
 WindowSelectorController::WindowSelectorController() {}
 
 WindowSelectorController::~WindowSelectorController() {
   // Destroy widgets that may be still animating if shell shuts down soon after
   // exiting overview mode.
   for (std::unique_ptr<DelayedAnimationObserver>& animation_observer :
@@ skipping 30 matching lines @@
         WmShell::Get()->mru_window_tracker()->BuildMruWindowList();
     auto end =
         std::remove_if(windows.begin(), windows.end(),
                        std::not1(std::ptr_fun(&WindowSelector::IsSelectable)));
     windows.resize(end - windows.begin());
 
     // Don't enter overview mode with no windows.
     if (windows.empty())
       return false;
 
-    WmShell::Get()->OnOverviewModeStarting();
+    Shell::GetInstance()->OnOverviewModeStarting();
     window_selector_.reset(new WindowSelector(this));
     window_selector_->Init(windows);
     OnSelectionStarted();
   }
   return true;
 }
 
 bool WindowSelectorController::IsSelecting() const {
   return window_selector_.get() != NULL;
 }
@@ skipping 12 matching lines @@
   return window_selector_.get() != NULL &&
          window_selector_->restoring_minimized_windows();
 }
 
 // TODO(flackr): Make WindowSelectorController observe the activation of
 // windows, so we can remove WindowSelectorDelegate.
 void WindowSelectorController::OnSelectionEnded() {
   window_selector_->Shutdown();
   window_selector_.reset();
   last_selection_time_ = base::Time::Now();
-  WmShell::Get()->OnOverviewModeEnded();
+  Shell::GetInstance()->OnOverviewModeEnded();
 }
 
 void WindowSelectorController::AddDelayedAnimationObserver(
     std::unique_ptr<DelayedAnimationObserver> animation_observer) {
   animation_observer->SetOwner(this);
   delayed_animations_.push_back(std::move(animation_observer));
 }
 
 void WindowSelectorController::RemoveAndDestroyAnimationObserver(
     DelayedAnimationObserver* animation_observer) {
@@ skipping 15 matching lines @@
 }
 
 void WindowSelectorController::OnSelectionStarted() {
   if (!last_selection_time_.is_null()) {
     UMA_HISTOGRAM_LONG_TIMES("Ash.WindowSelector.TimeBetweenUse",
                              base::Time::Now() - last_selection_time_);
   }
 }
 
 }  // namespace ash