Promotes more accessors from WmShell to Shell

ash/common/wm/window_cycle_list.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/window_cycle_list.h"
 
 #include <list>
 #include <map>
 
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.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 "base/command_line.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
@@ skipping 459 matching lines @@
     current_index_--;
   }
 
   if (cycle_view_) {
     WmWindow* new_target_window =
         windows_.empty() ? nullptr : windows_[current_index_];
     cycle_view_->HandleWindowDestruction(WmWindow::Get(window),
                                          new_target_window);
     if (windows_.empty()) {
       // This deletes us.
-      WmShell::Get()->window_cycle_controller()->CancelCycling();
+      Shell::Get()->window_cycle_controller()->CancelCycling();
       return;
     }
   }
 }
 
 void WindowCycleList::OnDisplayAdded(const display::Display& new_display) {}
 
 void WindowCycleList::OnDisplayRemoved(const display::Display& old_display) {}
 
 void WindowCycleList::OnDisplayMetricsChanged(const display::Display& display,
                                               uint32_t changed_metrics) {
   if (cycle_ui_widget_ &&
       display.id() ==
           display::Screen::GetScreen()
               ->GetDisplayNearestWindow(cycle_ui_widget_->GetNativeView())
               .id() &&
       (changed_metrics & (DISPLAY_METRIC_BOUNDS | DISPLAY_METRIC_ROTATION))) {
-    WmShell::Get()->window_cycle_controller()->CancelCycling();
+    Shell::Get()->window_cycle_controller()->CancelCycling();
     // |this| is deleted.
     return;
   }
 }
 
 bool WindowCycleList::ShouldShowUi() {
   return windows_.size() > 1;
 }
 
 void WindowCycleList::InitWindowCycleView() {
@@ skipping 22 matching lines @@
   widget_rect.set_height(widget_height);
   params.bounds = widget_rect;
   widget->Init(params);
 
   screen_observer_.Add(display::Screen::GetScreen());
   widget->Show();
   cycle_ui_widget_ = widget;
 }
 
 }  // namespace ash