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

Unified Diff: chrome/browser/ui/ash/ash_util.cc

Issue 1902393003: Don't check ash accelerators in browser with mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to ash_util.cc Created 4 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698