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

Unified Diff: chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include Created 4 years, 5 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 | « ash/wm/power_button_controller.cc ('k') | chrome/browser/extensions/api/automation/automation_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
index e37cd4abd6c7b6eab70a5bb435bcf4671cdb132c..5df6a5ada2cf14689e703798d7bf93548b4741c3 100644
--- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
@@ -8,6 +8,7 @@
#include "ash/common/accelerators/accelerator_table.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/system/tray/system_tray.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/macros.h"
@@ -104,7 +105,7 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest {
bool PerformAcceleratorAction(ash::AcceleratorAction action) {
ash::AcceleratorController* controller =
- ash::Shell::GetInstance()->accelerator_controller();
+ ash::WmShell::Get()->accelerator_controller();
return controller->PerformActionIfEnabled(action);
}
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | chrome/browser/extensions/api/automation/automation_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698