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

Unified Diff: views/widget/native_widget_aura.cc

Issue 8341050: Aura: Support non-global keyboard shortcuts. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: '' Created 9 years, 2 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
« views/view.cc ('K') | « views/view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/native_widget_aura.cc
diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc
index b1adcea43c75e912dd48ab8f94ef9e258be32d8b..a614c729f894e80984a89478c35359d28a4f6d07 100644
--- a/views/widget/native_widget_aura.cc
+++ b/views/widget/native_widget_aura.cc
@@ -446,7 +446,10 @@ gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const {
// NativeWidgetAura, views::InputMethodDelegate implementation:
void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) {
- delegate_->OnKeyEvent(key);
+ if (delegate_->OnKeyEvent(key))
+ return;
+ if (key.type() == ui::ET_KEY_PRESSED && GetWidget()->GetFocusManager())
Ben Goodger (Google) 2011/10/26 19:06:04 Is it standard practice to dispatch accelerators/t
mazda 2011/10/27 13:05:05 I think so. While users compose text with IME, the
+ GetWidget()->GetFocusManager()->OnKeyEvent(key);
}
////////////////////////////////////////////////////////////////////////////////
@@ -464,7 +467,8 @@ void NativeWidgetAura::OnFocus() {
InputMethod* input_method = widget->GetInputMethod();
input_method->OnFocus();
// See description of got_initial_focus_in_ for details on this.
- widget->GetFocusManager()->RestoreFocusedView();
+ // TODO(mazda): Investigate this is actually necessary.
+ // widget->GetFocusManager()->RestoreFocusedView();
}
delegate_->OnNativeFocus(window_);
}
« views/view.cc ('K') | « views/view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698