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

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 1703683003: The key event should be stopped propagation when it's been processed as an accelerator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CQ green. Created 4 years, 10 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 | « ui/views/mus/native_widget_mus.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index f77bde8e5ba3f4caff6ff53838adba50834191ae..68602f2cd71294fcf9abdedcd8baf7d13599f5dd 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -220,7 +220,7 @@ class FocusManagerEventHandler : public ui::EventHandler {
Widget* widget = desktop_native_widget_aura_->GetWidget();
if (widget && widget->GetFocusManager()->GetFocusedView() &&
!widget->GetFocusManager()->OnKeyEvent(*event)) {
- event->SetHandled();
+ event->StopPropagation();
}
}
@@ -1031,12 +1031,6 @@ void DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
return;
native_widget_delegate_->OnKeyEvent(event);
- if (event->handled())
- return;
-
- if (GetWidget()->HasFocusManager() &&
- !GetWidget()->GetFocusManager()->OnKeyEvent(*event))
- event->SetHandled();
}
void DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
« no previous file with comments | « ui/views/mus/native_widget_mus.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698