Revert 96162 - Revert 96149 - Enable/disable input methods according to |text_input_type_| when a...

chrome/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 191 matching lines @@
       case WM_MBUTTONDOWN:
         ::SendMessage(GetParent(window), message, wparam, lparam);
         return 0;
       default:
         break;
     }
   }
   return ::DefWindowProc(window, message, wparam, lparam);
 }
 
+bool ShouldEnableIME(ui::TextInputType type) {
+  return type != ui::TEXT_INPUT_TYPE_NONE &&
+    type != ui::TEXT_INPUT_TYPE_PASSWORD;
+}
+
 }  // namespace
 
 // RenderWidgetHostView --------------------------------------------------------
 
 // static
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   if (views::Widget::IsPureViews())
     return new RenderWidgetHostViewViews(widget);
   return new RenderWidgetHostViewWin(widget);
@@ skipping 58 matching lines @@
 }
 
 void RenderWidgetHostViewWin::DidBecomeSelected() {
   if (!is_hidden_)
     return;
 
   if (tab_switch_paint_time_.is_null())
     tab_switch_paint_time_ = TimeTicks::Now();
   is_hidden_ = false;
   EnsureTooltip();
+  if (ShouldEnableIME(text_input_type_))
+    ime_input_.EnableIME(m_hWnd);
+  else
+    ime_input_.DisableIME(m_hWnd);
   render_widget_host_->WasRestored();
 }
 
 void RenderWidgetHostViewWin::WasHidden() {
   if (is_hidden_)
     return;
 
   // If we receive any more paint messages while we are hidden, we want to
   // ignore them so we don't re-allocate the backing store.  We will paint
   // everything again when we become selected again.
@@ skipping 291 matching lines @@
 }
 
 void RenderWidgetHostViewWin::ImeUpdateTextInputState(
     ui::TextInputType type,
     bool can_compose_inline,
     const gfx::Rect& caret_rect) {
   // TODO(kinaba): currently, can_compose_inline is ignored and always treated
   // as true. We need to support "can_compose_inline=false" for PPAPI plugins
   // that may want to avoid drawing composition-text by themselves and pass
   // the responsibility to the browser.
-  bool is_enabled = (type != ui::TEXT_INPUT_TYPE_NONE &&
-      type != ui::TEXT_INPUT_TYPE_PASSWORD);
+  bool is_enabled = ShouldEnableIME(type);
   if (text_input_type_ != type) {
     text_input_type_ = type;
     if (is_enabled)
       ime_input_.EnableIME(m_hWnd);
     else
       ime_input_.DisableIME(m_hWnd);
   }
 
   // Only update caret position if the input method is enabled.
   if (is_enabled)
@@ skipping 1214 matching lines @@
                                                       DWORD ex_style) {
   parent_hwnd_ = parent_hwnd;
   Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
   // To show tooltip on popup window.(e.g. title in <select>)
   // Popups default to showing, which means |DidBecomeSelected()| isn't invoked.
   // Ensure the tooltip is created otherwise tooltips are never shown.
   EnsureTooltip();
   ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
 }