Moves AcceleratorController from Shell to WmShell

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 1140843dfc3da48e0522badeb2265b4a9a594dc3..667b3b62c22076a4f3271d28da0abc1f55a26bb1 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -63,6 +63,7 @@
 #if defined(USE_ASH)
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "chrome/browser/ui/ash/ash_init.h"
@@ -171,7 +172,7 @@ int GetAppbarAutohideEdgesOnWorkerThread(HMONITOR monitor) {
 void ProcessAcceleratorNow(const ui::Accelerator& accelerator) {
   // TODO(afakhry): See if we need here to send the accelerator to the
   // FocusManager of the active window in a follow-up CL.
-  ash::Shell::GetInstance()->accelerator_controller()->Process(accelerator);
+  ash::WmShell::Get()->accelerator_controller()->Process(accelerator);
 }
 #endif  // defined(USE_ASH)
 
@@ -277,7 +278,7 @@ ChromeViewsDelegate::ProcessAcceleratorWhileMenuShowing(
     return views::ViewsDelegate::ProcessMenuAcceleratorResult::LEAVE_MENU_OPEN;
 
   ash::AcceleratorController* accelerator_controller =
-      ash::Shell::GetInstance()->accelerator_controller();
+      ash::WmShell::Get()->accelerator_controller();
 
   accelerator_controller->accelerator_history()->StoreCurrentAccelerator(
       accelerator);