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

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge 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 | « no previous file | ash/accelerators/accelerator_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index afb7706e6e777528231b1ff490e95094d70f5d9d..93ca448b99b28dc9cbb566d30019992c3eb78bad 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -1286,8 +1286,8 @@ class DeprecatedAcceleratorTester : public AcceleratorControllerTest {
}
void ResetStateIfNeeded() {
- if (WmShell::Get()->session_controller()->IsScreenLocked() ||
- WmShell::Get()->session_controller()->IsUserSessionBlocked()) {
+ if (Shell::Get()->session_controller()->IsScreenLocked() ||
+ Shell::Get()->session_controller()->IsUserSessionBlocked()) {
UnblockUserSession();
}
}
« no previous file with comments | « no previous file | ash/accelerators/accelerator_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698