| Index: chrome/browser/ui/ash/accelerator_controller_browsertest.cc
|
| diff --git a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
|
| index a89cbca16b5b7e6741a7bee5a34ce12f9cc6f137..c8c0de25031a4f9a1c583e477673812543ae5e19 100644
|
| --- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
|
| +++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
|
| @@ -5,7 +5,7 @@
|
| #include "ash/common/accelerators/accelerator_controller.h"
|
|
|
| #include "ash/common/wm/window_state.h"
|
| -#include "ash/shell.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/ui/browser.h"
|
| @@ -34,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(AcceleratorControllerBrowserTest,
|
|
|
| ui::Accelerator accelerator(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);
|
| ash::AcceleratorController* accelerator_controller =
|
| - ash::Shell::GetInstance()->accelerator_controller();
|
| + ash::WmShell::Get()->accelerator_controller();
|
| ASSERT_TRUE(accelerator_controller->IsRegistered(accelerator));
|
|
|
| ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();
|
|
|