Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/accelerator_controller_browsertest.cc

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)
Patch Set: fix include Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f381e1bcdc8260f6f951f88b66de9d4083d71d36..5e5c9db2aac903c7f797735ef5bc29690f7d6e96 100644
--- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
@@ -5,7 +5,6 @@
#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 "build/build_config.h"
@@ -35,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::WmShell::Get()->accelerator_controller();
+ ash::Shell::Get()->accelerator_controller();
ASSERT_TRUE(accelerator_controller->IsRegistered(accelerator));
ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698