Move AcceleratorController from WmShell to Shell

chrome/browser/extensions/global_shortcut_listener_chromeos.cc

Index: chrome/browser/extensions/global_shortcut_listener_chromeos.cc
diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
index 900dccd0eff2c028b11f23fbf8c5fcc685f23cfb..e594abe1f54fbb48784a72d2f0c0691e12a01031 100644
--- a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/extensions/global_shortcut_listener_chromeos.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -43,7 +43,7 @@ void GlobalShortcutListenerChromeOS::StopListening() {
 bool GlobalShortcutListenerChromeOS::RegisterAcceleratorImpl(
     const ui::Accelerator& accelerator) {
   ash::AcceleratorController* controller =
-      ash::WmShell::Get()->accelerator_controller();
+      ash::Shell::Get()->accelerator_controller();
   if (controller->IsRegistered(accelerator))
     return false;
 
@@ -55,16 +55,16 @@ bool GlobalShortcutListenerChromeOS::RegisterAcceleratorImpl(
 void GlobalShortcutListenerChromeOS::UnregisterAcceleratorImpl(
     const ui::Accelerator& accelerator) {
   // This code path gets called during object destruction.
-  if (!ash::WmShell::HasInstance())
+  if (!ash::Shell::HasInstance())
     return;
-  ash::WmShell::Get()->accelerator_controller()->Unregister(accelerator, this);
+  ash::Shell::Get()->accelerator_controller()->Unregister(accelerator, this);
 }
 
 bool GlobalShortcutListenerChromeOS::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   DCHECK(is_listening_);
   ash::AcceleratorController* controller =
-      ash::WmShell::Get()->accelerator_controller();
+      ash::Shell::Get()->accelerator_controller();
   ash::AcceleratorController::AcceleratorProcessingRestriction restriction =
       controller->GetCurrentAcceleratorRestriction();
   if (restriction == ash::AcceleratorController::RESTRICTION_NONE) {