Move AcceleratorController from WmShell to Shell

chrome/browser/ui/views/chrome_views_delegate_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/views/chrome_views_delegate.h"
 
 #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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace {
 
 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::WmShell::Get()->accelerator_controller()->Process(accelerator);
+  ash::Shell::Get()->accelerator_controller()->Process(accelerator);
 }
 
 }  // namespace
 
 views::ViewsDelegate::ProcessMenuAcceleratorResult
 ChromeViewsDelegate::ProcessAcceleratorWhileMenuShowing(
     const ui::Accelerator& accelerator) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
   // Early return because mash chrome does not have access to ash::Shell
   if (ash_util::IsRunningInMash())
     return views::ViewsDelegate::ProcessMenuAcceleratorResult::LEAVE_MENU_OPEN;
 
   ash::AcceleratorController* accelerator_controller =
-      ash::WmShell::Get()->accelerator_controller();
+      ash::Shell::Get()->accelerator_controller();
 
   accelerator_controller->accelerator_history()->StoreCurrentAccelerator(
       accelerator);
   if (accelerator_controller->ShouldCloseMenuAndRepostAccelerator(
           accelerator)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(ProcessAcceleratorNow, accelerator));
     return views::ViewsDelegate::ProcessMenuAcceleratorResult::CLOSE_MENU;
   }
 
@@ skipping 37 matching lines @@
     params->context = params->context->GetRootWindow();
   DCHECK(params->parent || params->context || !params->child)
       << "Please provide a parent or context for this widget.";
   if (!params->parent && !params->context)
     params->context = ash::Shell::GetPrimaryRootWindow();
 
   // By returning null Widget creates the default NativeWidget implementation,
   // which for chromeos is NativeWidgetAura.
   return nullptr;
 }