Move AcceleratorController from WmShell to Shell

chrome/browser/ui/ash/ash_init.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 "chrome/browser/ui/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
+#include "ash/aura/wm_shell_aura.h"
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_types.h"
-#include "ash/common/wm_shell.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "base/command_line.h"
 #include "base/sys_info.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 40 matching lines @@
 
   ash::ShellInitParams shell_init_params;
   // Shell takes ownership of ChromeShellDelegate.
   shell_init_params.delegate = new ChromeShellDelegate;
   shell_init_params.context_factory = content::GetContextFactory();
   shell_init_params.context_factory_private =
       content::GetContextFactoryPrivate();
   shell_init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
 
   ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params);
-  shell->accelerator_controller_delegate()->SetScreenshotDelegate(
-      std::unique_ptr<ash::ScreenshotDelegate>(new ChromeScreenshotGrabber));
+  ash::WmShellAura::Get()
+      ->accelerator_controller_delegate()
+      ->SetScreenshotDelegate(std::unique_ptr<ash::ScreenshotDelegate>(
+          new ChromeScreenshotGrabber));
   // TODO(flackr): Investigate exposing a blocking pool task runner to chromeos.
   chromeos::AccelerometerReader::GetInstance()->Initialize(
       content::BrowserThread::GetBlockingPool()
           ->GetSequencedTaskRunnerWithShutdownBehavior(
               content::BrowserThread::GetBlockingPool()->GetSequenceToken(),
               base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
-  ash::WmShell::Get()->accelerator_controller()->SetImeControlDelegate(
+  shell->accelerator_controller()->SetImeControlDelegate(
       std::unique_ptr<ash::ImeControlDelegate>(new ImeController));
   shell->high_contrast_controller()->SetEnabled(
       chromeos::AccessibilityManager::Get()->IsHighContrastEnabled());
 
   DCHECK(chromeos::MagnificationManager::Get());
   bool magnifier_enabled =
       chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
   ash::MagnifierType magnifier_type =
       chromeos::MagnificationManager::Get()->GetMagnifierType();
   shell->magnification_controller()->SetEnabled(
       magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL);
   shell->partial_magnification_controller()->SetEnabled(
       magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableZeroBrowsersOpenForTests)) {
     g_browser_process->platform_part()->RegisterKeepAlive();
   }
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
 void CloseAsh() {
   if (ash::Shell::HasInstance()) {
     ash::Shell::DeleteInstance();
     ash::ShellContentState::DestroyInstance();
   }
 }
 
 }  // namespace chrome