diff options
| author | shuchen <shuchen@chromium.org> | 2014-10-22 18:55:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 02:00:06 +0000 |
| commit | 82ce8c52345cd8ba927e05d370ef328a1112df71 (patch) | |
| tree | f77694275503780950153046841183990169e7f0 /content/browser/browser_plugin/browser_plugin_guest.cc | |
| parent | daa9107a10bca2c1ca762c7fefdeacad5a414c7b (diff) | |
| download | chromium_src-82ce8c52345cd8ba927e05d370ef328a1112df71.zip chromium_src-82ce8c52345cd8ba927e05d370ef328a1112df71.tar.gz chromium_src-82ce8c52345cd8ba927e05d370ef328a1112df71.tar.bz2 | |
Exposes the text input flags to ChromeOS IME extensions.
BUG=419127
TEST=Verified on linux_chromeos.
Review URL: https://codereview.chromium.org/659323003
Cr-Commit-Position: refs/heads/master@{#300820}
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_guest.cc')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 68876ea..ea6a573 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -86,6 +86,7 @@ BrowserPluginGuest::BrowserPluginGuest(bool has_render_view, is_in_destruction_(false), last_text_input_type_(ui::TEXT_INPUT_TYPE_NONE), last_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT), + last_input_flags_(0), last_can_compose_inline_(true), guest_proxy_routing_id_(MSG_ROUTING_NONE), delegate_(delegate), @@ -121,7 +122,7 @@ void BrowserPluginGuest::SetFocus(RenderWidgetHost* rwh, bool focused) { rwh->GetView()); if (rwhv) { rwhv->TextInputTypeChanged(last_text_input_type_, last_input_mode_, - last_can_compose_inline_); + last_can_compose_inline_, last_input_flags_); } } @@ -800,15 +801,17 @@ void BrowserPluginGuest::OnTakeFocus(bool reverse) { void BrowserPluginGuest::OnTextInputTypeChanged(ui::TextInputType type, ui::TextInputMode input_mode, - bool can_compose_inline) { + bool can_compose_inline, + int flags) { // Save the state of text input so we can restore it on focus. last_text_input_type_ = type; last_input_mode_ = input_mode; + last_input_flags_ = flags; last_can_compose_inline_ = can_compose_inline; static_cast<RenderWidgetHostViewBase*>( web_contents()->GetRenderWidgetHostView())->TextInputTypeChanged( - type, input_mode, can_compose_inline); + type, input_mode, can_compose_inline, flags); } void BrowserPluginGuest::OnImeCancelComposition() { |