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

Unified Diff: trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Issue 23710009: Revert 219673 "Fix Views Combobox and Tree View text input." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc (revision 220120)
+++ trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc (working copy)
@@ -28,6 +28,7 @@
#include "ui/views/corewm/focus_controller.h"
#include "ui/views/corewm/input_method_event_filter.h"
#include "ui/views/corewm/window_animations.h"
+#include "ui/views/ime/input_method_bridge.h"
#include "ui/views/widget/desktop_aura/desktop_activation_client.h"
#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"
#include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
@@ -373,6 +374,13 @@
message_handler_->FlashFrame(flash_frame);
}
+void DesktopRootWindowHostWin::OnNativeWidgetFocus() {
+ // HWNDMessageHandler will perform the proper updating on its own.
+}
+
+void DesktopRootWindowHostWin::OnNativeWidgetBlur() {
+}
+
////////////////////////////////////////////////////////////////////////////////
// DesktopRootWindowHostWin, RootWindowHost implementation:
@@ -749,10 +757,16 @@
void DesktopRootWindowHostWin::HandleNativeFocus(HWND last_focused_window) {
// TODO(beng): inform the native_widget_delegate_.
+ InputMethod* input_method = GetInputMethod();
+ if (input_method)
+ input_method->OnFocus();
}
void DesktopRootWindowHostWin::HandleNativeBlur(HWND focused_window) {
// TODO(beng): inform the native_widget_delegate_.
+ InputMethod* input_method = GetInputMethod();
+ if (input_method)
+ input_method->OnBlur();
}
bool DesktopRootWindowHostWin::HandleMouseEvent(const ui::MouseEvent& event) {

Powered by Google App Engine
This is Rietveld 408576698