| 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))
|
|
|