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

Unified Diff: ui/views/cocoa/bridged_native_widget.mm

Issue 1257603006: Refactoring for the InputMethod & InputMethodDelegate interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test failures on windows. Created 5 years, 5 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: ui/views/cocoa/bridged_native_widget.mm
diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
index 0769dae12894468094ee50a1ddb8fecb7e683106..93b1a9529433c13103344ce6937927c5574f3a65 100644
--- a/ui/views/cocoa/bridged_native_widget.mm
+++ b/ui/views/cocoa/bridged_native_widget.mm
@@ -789,12 +789,15 @@ void BridgedNativeWidget::CreateLayer(ui::LayerType layer_type,
////////////////////////////////////////////////////////////////////////////////
// BridgedNativeWidget, internal::InputMethodDelegate:
-bool BridgedNativeWidget::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
+ui::EventDispatchDetails BridgedNativeWidget::DispatchKeyEventPostIME(
+ ui::KeyEvent* key) {
DCHECK(focus_manager_);
- native_widget_mac_->GetWidget()->OnKeyEvent(const_cast<ui::KeyEvent*>(&key));
- if (!key.handled())
- return !focus_manager_->OnKeyEvent(key);
- return key.handled();
+ native_widget_mac_->GetWidget()->OnKeyEvent(key);
+ if (!key->handled()) {
+ if (!focus_manager_->OnKeyEvent(*key))
+ key->StopPropagation();
+ }
+ return ui::EventDispatchDetails();
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698