| Index: chrome/browser/ui/ash/ash_util.cc
|
| diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
|
| index 6f3f395a6044e32cc9c8c8b82156e31de290620f..ee36f53dc6b65b74221460487ccc1f3d0303cf1c 100644
|
| --- a/chrome/browser/ui/ash/ash_util.cc
|
| +++ b/chrome/browser/ui/ash/ash_util.cc
|
| @@ -59,6 +59,10 @@ bool IsNativeWindowInAsh(gfx::NativeWindow native_window) {
|
| }
|
|
|
| bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
|
| + // When running in mash the browser doesn't handle ash accelerators.
|
| + if (chrome::IsRunningInMash())
|
| + return false;
|
| +
|
| ash::AcceleratorController* controller =
|
| ash::Shell::GetInstance()->accelerator_controller();
|
| return controller->IsDeprecated(accelerator);
|
|
|