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

Unified Diff: ash/common/accelerators/accelerator_controller.cc

Issue 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)
Patch Set: feedback 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 | « ash/common/DEPS ('k') | ash/common/accelerators/debug_commands.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/accelerators/accelerator_controller.cc
diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc
index 944245ee496d9660c0917be4f1bc1182deac569c..89c946f59965017fdd1d93f76e90b306fc1b72f4 100644
--- a/ash/common/accelerators/accelerator_controller.cc
+++ b/ash/common/accelerators/accelerator_controller.cc
@@ -144,7 +144,7 @@ void HandleMediaPrevTrack() {
}
bool CanHandleNewIncognitoWindow() {
- return WmShell::Get()->delegate()->IsIncognitoAllowed();
+ return Shell::Get()->shell_delegate()->IsIncognitoAllowed();
}
void HandleNewIncognitoWindow() {
@@ -414,7 +414,7 @@ void HandleSuspend() {
}
bool CanHandleCycleUser() {
- return WmShell::Get()->delegate()->IsMultiProfilesEnabled() &&
+ return Shell::Get()->shell_delegate()->IsMultiProfilesEnabled() &&
WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers() > 1;
}
@@ -1110,7 +1110,7 @@ AcceleratorController::GetAcceleratorProcessingRestriction(int action) {
actions_allowed_at_lock_screen_.end()) {
return RESTRICTION_PREVENT_PROCESSING;
}
- if (wm_shell->delegate()->IsRunningInForcedAppMode() &&
+ if (Shell::Get()->shell_delegate()->IsRunningInForcedAppMode() &&
actions_allowed_in_app_mode_.find(action) ==
actions_allowed_in_app_mode_.end()) {
return RESTRICTION_PREVENT_PROCESSING;
« no previous file with comments | « ash/common/DEPS ('k') | ash/common/accelerators/debug_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698