Moves couple of WmShell methods to standalone functions

ash/common/focus_cycler.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/common/focus_cycler.h"
 
 #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/shell.h"
+#include "ash/wm/window_util.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
 
 bool HasFocusableWindow() {
@@ skipping 10 matching lines @@
   widgets_.push_back(widget);
 }
 
 void FocusCycler::RemoveWidget(views::Widget* widget) {
   auto iter = std::find(widgets_.begin(), widgets_.end(), widget);
   if (iter != widgets_.end())
     widgets_.erase(iter);
 }
 
 void FocusCycler::RotateFocus(Direction direction) {
-  WmWindow* window = WmShell::Get()->GetActiveWindow();
+  WmWindow* window = WmWindow::Get(wm::GetActiveWindow());
   if (window) {
     views::Widget* widget = window->GetInternalWidget();
     // First try to rotate focus within the active widget. If that succeeds,
     // we're done.
     if (widget &&
         widget->GetFocusManager()->RotatePaneFocus(
             direction == BACKWARD ? views::FocusManager::kBackward
                                   : views::FocusManager::kForward,
             views::FocusManager::kNoWrap)) {
       return;
@@ skipping 53 matching lines @@
 bool FocusCycler::FocusWidget(views::Widget* widget) {
   // Note: It is not necessary to set the focus directly to the pane since that
   // will be taken care of by the widget activation.
   widget_activating_ = widget;
   widget->Activate();
   widget_activating_ = NULL;
   return widget->IsActive();
 }
 
 }  // namespace ash