Folds methods in WmShellCommon to WmShell

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 "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() {
-  return !WmShell::Get()->GetMruWindowTracker()->BuildMruWindowList().empty();
+  return !WmShell::Get()->mru_window_tracker()->BuildMruWindowList().empty();
 }
 
 }  // namespace
 
 FocusCycler::FocusCycler() : widget_activating_(nullptr) {}
 
 FocusCycler::~FocusCycler() {}
 
 void FocusCycler::AddWidget(views::Widget* widget) {
   widgets_.push_back(widget);
@@ skipping 41 matching lines @@
     else
       index = ((index - 1) + count) % count;
 
     // Ensure that we don't loop more than once.
     if (index == start_index)
       break;
 
     if (index == browser_index) {
       // Activate the most recently active browser window.
       MruWindowTracker::WindowList mru_windows(
-          WmShell::Get()->GetMruWindowTracker()->BuildMruWindowList());
+          WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
       if (mru_windows.empty())
         break;
       WmWindow* window = mru_windows.front();
       window->GetWindowState()->Activate();
       views::Widget* widget = window->GetInternalWidget();
       if (!widget)
         break;
       views::FocusManager* focus_manager = widget->GetFocusManager();
       focus_manager->ClearFocus();
       focus_manager->RotatePaneFocus(direction == BACKWARD
@@ skipping 11 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