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

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

Issue 23245012: Fix Views Combobox and Tree View text input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nit. Created 7 years, 4 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/ime/mock_input_method.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host.h » ('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 859decc9880113165288d8bcea8cad62a0af6024..cac3cbdd87eb20bb9f144f0b19b35d84867fd1e3 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -862,17 +862,8 @@ void DesktopNativeWidgetAura::OnWindowActivated(aura::Window* gained_active,
void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
aura::Window* lost_focus) {
if (window_ == gained_focus) {
- desktop_root_window_host_->OnNativeWidgetFocus();
native_widget_delegate_->OnNativeFocus(lost_focus);
-
- // If focus is moving from a descendant Window to |window_| then native
- // activation hasn't changed. We still need to inform the InputMethod we've
- // been focused though.
- InputMethod* input_method = GetWidget()->GetInputMethod();
- if (input_method)
- input_method->OnFocus();
} else if (window_ == lost_focus) {
- desktop_root_window_host_->OnNativeWidgetBlur();
native_widget_delegate_->OnNativeBlur(
aura::client::GetFocusClient(window_)->GetFocusedWindow());
}
« no previous file with comments | « ui/views/ime/mock_input_method.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698