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

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 21189003: Change IME conversion status by focusing input element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit pick 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: content/browser/renderer_host/render_widget_host_view_win.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index 9096e37df19d1b1213530d9eb7d9f5d9c16b10c8..b64fa45eece11c26e0d5179399c9077d4d526c5c 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -404,6 +404,7 @@ RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget)
weak_factory_(this),
is_loading_(false),
text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
+ text_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
can_compose_inline_(true),
is_fullscreen_(false),
ignore_mouse_movement_(true),
@@ -692,9 +693,12 @@ void RenderWidgetHostViewWin::TextInputTypeChanged(
bool can_compose_inline,
ui::TextInputMode input_mode) {
if (text_input_type_ != type ||
+ text_input_mode_ != input_mode ||
can_compose_inline_ != can_compose_inline) {
- const bool text_input_type_changed = (text_input_type_ != type);
+ const bool text_input_type_changed = (text_input_type_ != type) ||
+ (text_input_mode_ != input_mode);
text_input_type_ = type;
+ text_input_mode_ = input_mode;
can_compose_inline_ = can_compose_inline;
UpdateIMEState();
if (text_input_type_changed)
@@ -3155,6 +3159,8 @@ void RenderWidgetHostViewWin::UpdateIMEState() {
} else {
imm32_manager_->DisableIME(m_hWnd);
}
+
+ imm32_manager_->SetTextInputMode(m_hWnd, text_input_mode_);
}
void RenderWidgetHostViewWin::UpdateInputScopeIfNecessary(

Powered by Google App Engine
This is Rietveld 408576698