| 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 acc047db0f0cb221acd50ae6eea282ac1969274d..34b8ff6150519975b06cc16b19e7dc48b4945912 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -45,7 +45,6 @@
|
| #include "content/browser/renderer_host/ui_events_helper.h"
|
| #include "content/browser/renderer_host/web_input_event_aura.h"
|
| #include "content/common/content_switches_internal.h"
|
| -#include "content/common/input_messages.h"
|
| #include "content/common/site_isolation_policy.h"
|
| #include "content/common/text_input_state.h"
|
| #include "content/common/view_messages.h"
|
| @@ -108,6 +107,7 @@
|
| #endif
|
|
|
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| +#include "content/common/input_messages.h"
|
| #include "ui/base/ime/linux/text_edit_command_auralinux.h"
|
| #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
|
| #endif
|
| @@ -2987,23 +2987,8 @@
|
| const TextInputState* state = text_input_manager_->GetTextInputState();
|
|
|
| if (state && state->show_ime_if_needed &&
|
| - state->type != ui::TEXT_INPUT_TYPE_NONE) {
|
| + state->type != ui::TEXT_INPUT_TYPE_NONE)
|
| GetInputMethod()->ShowImeIfNeeded();
|
| -
|
| - // Start monitoring the composition information if the focused node is
|
| - // editable.
|
| - host_->Send(new InputMsg_RequestCompositionUpdate(
|
| - host_->GetRoutingID(),
|
| - false /* immediate request */,
|
| - true /* monitor request */));
|
| - } else {
|
| - // Stop monitoring the composition information if the focused node is not
|
| - // editable.
|
| - host_->Send(new InputMsg_RequestCompositionUpdate(
|
| - host_->GetRoutingID(),
|
| - false /* immediate request */,
|
| - false /* monitor request */));
|
| - }
|
| }
|
|
|
| void RenderWidgetHostViewAura::OnImeCancelComposition(
|
|
|