Moves maintaining root_window_for_new_windows_ to Shell

ash/common/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/accelerators/accelerator_controller_delegate.h"
@@ skipping 23 matching lines @@
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/window_cycle_controller.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 54 matching lines @@
     case FocusCycler::BACKWARD: {
       base::RecordAction(UserMetricsAction("Accel_Focus_Previous_Pane"));
       break;
     }
   }
   WmShell::Get()->focus_cycler()->RotateFocus(direction);
 }
 
 void HandleFocusShelf() {
   base::RecordAction(UserMetricsAction("Accel_Focus_Shelf"));
-  // TODO(jamescook): Should this be GetRootWindowForNewWindows()?
+  // TODO(jamescook): Should this be GetWmRootWindowForNewWindows()?
   WmShelf* shelf = WmShelf::ForWindow(WmShell::Get()->GetPrimaryRootWindow());
   WmShell::Get()->focus_cycler()->FocusWidget(shelf->shelf_widget());
 }
 
 void HandleLaunchAppN(int n) {
   base::RecordAction(UserMetricsAction("Accel_Launch_App"));
   WmShelf::LaunchShelfItem(n);
 }
 
 void HandleLaunchLastApp() {
@@ skipping 75 matching lines @@
   base::RecordAction(UserMetricsAction("Accel_Restore_Tab"));
   WmShell::Get()->new_window_controller()->RestoreTab();
 }
 
 void HandleShowKeyboardOverlay() {
   base::RecordAction(UserMetricsAction("Accel_Show_Keyboard_Overlay"));
   WmShell::Get()->new_window_controller()->ShowKeyboardOverlay();
 }
 
 bool CanHandleShowMessageCenterBubble() {
-  WmWindow* target_root = WmShell::Get()->GetRootWindowForNewWindows();
+  WmWindow* target_root = Shell::GetWmRootWindowForNewWindows();
   StatusAreaWidget* status_area_widget =
       WmShelf::ForWindow(target_root)->shelf_widget()->status_area_widget();
   return status_area_widget &&
          status_area_widget->web_notification_tray()->visible();
 }
 
 void HandleShowMessageCenterBubble() {
   base::RecordAction(UserMetricsAction("Accel_Show_Message_Center_Bubble"));
-  WmWindow* target_root = WmShell::Get()->GetRootWindowForNewWindows();
+  WmWindow* target_root = Shell::GetWmRootWindowForNewWindows();
   StatusAreaWidget* status_area_widget =
       WmShelf::ForWindow(target_root)->shelf_widget()->status_area_widget();
   if (status_area_widget) {
     WebNotificationTray* notification_tray =
         status_area_widget->web_notification_tray();
     if (notification_tray->visible())
       notification_tray->ShowMessageCenterBubble();
   }
 }
 
@@ skipping 153 matching lines @@
 
 void HandleLock() {
   base::RecordAction(UserMetricsAction("Accel_LockScreen_L"));
   WmShell::Get()->GetSessionStateDelegate()->LockScreen();
 }
 
 void HandleShowStylusTools() {
   base::RecordAction(UserMetricsAction("Accel_Show_Stylus_Tools"));
 
   RootWindowController* root_window_controller =
-      WmShell::Get()->GetRootWindowForNewWindows()->GetRootWindowController();
+      Shell::GetWmRootWindowForNewWindows()->GetRootWindowController();
   PaletteTray* palette_tray =
       root_window_controller->GetShelf()->GetStatusAreaWidget()->palette_tray();
   palette_tray->ShowPalette();
 }
 
 bool CanHandleShowStylusTools() {
   return WmShell::Get()->palette_delegate() &&
          WmShell::Get()->palette_delegate()->ShouldShowPalette();
 }
 
@@ skipping 756 matching lines @@
         data->old_shortcut_id, data->new_shortcut_id);
   }
 
   if (!data->deprecated_enabled)
     return AcceleratorProcessingStatus::STOP;
 
   return AcceleratorProcessingStatus::PROCEED;
 }
 
 }  // namespace ash