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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/automation/automation_apitest.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/chromeos/accessibility/spoken_feedback_browsertest.cc ('k') | chrome/browser/extensions/global_shortcut_listener_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/automation/automation_apitest.cc
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
index b498453e2d3be4f3929638da1c88e6f2a300da7d..82a9f910989cf833ea374f3961d531094b24d4fd 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -34,7 +34,7 @@
#if defined(OS_CHROMEOS)
#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
#endif
@@ -203,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusIframe) {
IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) {
AutomationManagerAura::GetInstance()->Enable(browser()->profile());
// Trigger the shelf subtree to be computed.
- ash::WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
+ ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled(
ash::FOCUS_SHELF);
ASSERT_TRUE(
@@ -221,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotRequested) {
IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) {
AutomationManagerAura::GetInstance()->Enable(browser()->profile());
// Trigger the shelf subtree to be computed.
- ash::WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
+ ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled(
ash::FOCUS_SHELF);
ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html"))
« no previous file with comments | « chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc ('k') | chrome/browser/extensions/global_shortcut_listener_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698