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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 2769213005: Adds kWillProcessAccelerator_KeyEventProperty (Closed)
Patch Set: cleanup 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
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index b39783fb509d5e73454ee3f535cc97c7b86c0154..e4f515308f92f9f2fe073e579e754033ace55c9d 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1353,6 +1353,14 @@ content::KeyboardEventProcessingResult BrowserView::PreHandleKeyboardEvent(
if (frame_->PreHandleKeyboardEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
+#if defined(OS_CHROMEOS)
+ if (event.os_event && event.os_event->IsKeyEvent() &&
+ ash_util::WillAshProcessAcceleratorForEvent(
+ *event.os_event->AsKeyEvent())) {
+ return content::KeyboardEventProcessingResult::HANDLED_DONT_UPDATE_EVENT;
+ }
+#endif
+
chrome::BrowserCommandController* controller = browser_->command_controller();
// Here we need to retrieve the command id (if any) associated to the
« ash/mus/accelerators/accelerator_controller_registrar.cc ('K') | « chrome/browser/ui/ash/ash_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698