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

Unified Diff: ash/common/accelerators/accelerator_router.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 | « ash/aura/wm_shell_aura.cc ('k') | ash/common/accelerators/ash_focus_manager_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/accelerators/accelerator_router.cc
diff --git a/ash/common/accelerators/accelerator_router.cc b/ash/common/accelerators/accelerator_router.cc
index c11c5f23c9a0f5accecc0e7cfe7903e8e60bdd65..971d0c44f28912e72c8d4a5e86b8523effcdb240 100644
--- a/ash/common/accelerators/accelerator_router.cc
+++ b/ash/common/accelerators/accelerator_router.cc
@@ -57,12 +57,12 @@ bool AcceleratorRouter::ProcessAccelerator(WmWindow* target,
!CanConsumeSystemKeys(target, key_event)) {
// System keys are always consumed regardless of whether they trigger an
// accelerator to prevent windows from seeing unexpected key up events.
- WmShell::Get()->accelerator_controller()->Process(accelerator);
+ Shell::Get()->accelerator_controller()->Process(accelerator);
return true;
}
if (!ShouldProcessAcceleratorNow(target, key_event, accelerator))
return false;
- return WmShell::Get()->accelerator_controller()->Process(accelerator);
+ return Shell::Get()->accelerator_controller()->Process(accelerator);
}
void AcceleratorRouter::RecordSearchKeyStats(
@@ -108,7 +108,7 @@ bool AcceleratorRouter::ShouldProcessAcceleratorNow(
return true;
AcceleratorController* accelerator_controller =
- WmShell::Get()->accelerator_controller();
+ Shell::Get()->accelerator_controller();
// Reserved accelerators (such as Power button) always have a prority.
if (accelerator_controller->IsReserved(accelerator))
« no previous file with comments | « ash/aura/wm_shell_aura.cc ('k') | ash/common/accelerators/ash_focus_manager_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698