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

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

Issue 23445020: Support inputmode attribute for Windows Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unused include Created 7 years, 3 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 | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | ui/base/ime/input_method_imm32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 261278f41e864312101a6f23f7748481b62ed215..dd65dd8018d0ed214965488016c9f2ff4c5b9271 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -647,6 +647,7 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
popup_child_host_view_(NULL),
is_loading_(false),
text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
+ text_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
can_compose_inline_(true),
has_composition_text_(false),
last_swapped_surface_scale_factor_(1.f),
@@ -1043,8 +1044,10 @@ void RenderWidgetHostViewAura::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) {
text_input_type_ = type;
+ text_input_mode_ = input_mode;
can_compose_inline_ = can_compose_inline;
if (GetInputMethod())
GetInputMethod()->OnTextInputTypeChanged(this);
@@ -2184,7 +2187,7 @@ ui::TextInputType RenderWidgetHostViewAura::GetTextInputType() const {
}
ui::TextInputMode RenderWidgetHostViewAura::GetTextInputMode() const {
- return ui::TEXT_INPUT_MODE_DEFAULT;
+ return text_input_mode_;
}
bool RenderWidgetHostViewAura::CanComposeInline() const {
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | ui/base/ime/input_method_imm32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698