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

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: Restore native_widget_aura change 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
« no previous file with comments | « chrome/chrome_browser.gypi ('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 de95a18bba5afa5fc78121cd84cc70721953d381..6c0f1695a14b2e2cd9978e318287c3143bf3edc5 100644
--- a/views/widget/native_widget_aura.cc
+++ b/views/widget/native_widget_aura.cc
@@ -419,7 +419,8 @@ void NativeWidgetAura::SetCursor(gfx::NativeCursor cursor) {
}
void NativeWidgetAura::ClearNativeFocus() {
- NOTIMPLEMENTED();
+ if (window_ && window_->GetFocusManager())
+ window_->GetFocusManager()->SetFocusedWindow(window_);
}
void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {
@@ -440,7 +441,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())
+ GetWidget()->GetFocusManager()->OnKeyEvent(key);
}
////////////////////////////////////////////////////////////////////////////////
@@ -458,7 +462,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_);
}
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698