Remove the 2-level input method system & InputMethodBridge.

ui/views/controls/textfield/textfield.cc

 // Copyright (c) 2012 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 "ui/views/controls/textfield/textfield.h"
 
 #include <string>
 
 #include "base/trace_event/trace_event.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/touch/selection_bound.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/canvas_painter.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/drag_utils.h"
-#include "ui/views/ime/input_method.h"
 #include "ui/views/metrics.h"
 #include "ui/views/native_cursor.h"
 #include "ui/views/painter.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
 
@@ skipping 239 matching lines @@
   SetBorder(scoped_ptr<Border>(new FocusableBorder()));
   SetFocusable(true);
 
   if (ViewsDelegate::GetInstance()) {
     password_reveal_duration_ =
         ViewsDelegate::GetInstance()
             ->GetDefaultTextfieldObscuredRevealDuration();
   }
 }
 
-Textfield::~Textfield() {}
+Textfield::~Textfield() {
+  if (GetInputMethod() && GetTextInputClient())

[James Su, 2015/06/12 07:58:50]

GetTextInputClient() returns 'this', so no need to check it here.

[Shu Chen, 2015/06/12 08:51:31]

yukawa@'s comment pointed out the derived class of Textfield can override
GetTextInputClient() to provide non-this pointer.
I think it is better to mark Textfield::GetTextInputClient() as final.
Done the change.

+    GetInputMethod()->DetachTextInputClient(GetTextInputClient());

[James Su, 2015/06/12 07:58:50]

use 'this' directly?

[Shu Chen, 2015/06/12 08:51:31]

Done.

+}
 
 void Textfield::SetReadOnly(bool read_only) {
   // Update read-only without changing the focusable state (or active, etc.).
   read_only_ = read_only;
-  if (GetInputMethod())
-    GetInputMethod()->OnTextInputTypeChanged(this);
+  if (GetInputMethod() && GetTextInputClient())

[James Su, 2015/06/12 07:58:50]

ditto

[Shu Chen, 2015/06/12 08:51:31]

Done.

+    GetInputMethod()->OnTextInputTypeChanged(GetTextInputClient());

[James Su, 2015/06/12 07:58:50]

ditto

[Shu Chen, 2015/06/12 08:51:31]

Done.

   SetColor(GetTextColor());
   UpdateBackgroundColor();
 }
 
 void Textfield::SetTextInputType(ui::TextInputType type) {
   GetRenderText()->SetObscured(type == ui::TEXT_INPUT_TYPE_PASSWORD);
   text_input_type_ = type;
   OnCaretBoundsChanged();
-  if (GetInputMethod())
-    GetInputMethod()->OnTextInputTypeChanged(this);
+  if (GetInputMethod() && GetTextInputClient())

[James Su, 2015/06/12 07:58:50]

ditto

[Shu Chen, 2015/06/12 08:51:31]

Done.

+    GetInputMethod()->OnTextInputTypeChanged(GetTextInputClient());

[James Su, 2015/06/12 07:58:50]

ditto

[Shu Chen, 2015/06/12 08:51:31]

Done.

   SchedulePaint();
 }
 
 void Textfield::SetTextInputFlags(int flags) {
   text_input_flags_ = flags;
 }
 
 void Textfield::SetText(const base::string16& new_text) {
   model_->SetText(new_text);
   OnCaretBoundsChanged();
@@ skipping 651 matching lines @@
   return true;
 }
 
 void Textfield::OnVisibleBoundsChanged() {
   if (touch_selection_controller_)
     touch_selection_controller_->SelectionChanged();
 }
 
 void Textfield::OnEnabledChanged() {
   View::OnEnabledChanged();
-  if (GetInputMethod())
-    GetInputMethod()->OnTextInputTypeChanged(this);
+  if (GetInputMethod() && GetTextInputClient())
+    GetInputMethod()->OnTextInputTypeChanged(GetTextInputClient());

[James Su, 2015/06/12 07:58:50]

ditto

[Shu Chen, 2015/06/12 08:51:31]

Done.

   SchedulePaint();
 }
 
 void Textfield::OnPaint(gfx::Canvas* canvas) {
   OnPaintBackground(canvas);
   PaintTextAndCursor(canvas);
   OnPaintBorder(canvas);
 }
 
 void Textfield::OnFocus() {
   GetRenderText()->set_focused(true);
   cursor_visible_ = true;
   SchedulePaint();
-  GetInputMethod()->OnFocus();
+  if (GetInputMethod() && GetTextInputClient())
+    GetInputMethod()->SetFocusedTextInputClient(GetTextInputClient());

[James Su, 2015/06/12 07:58:50]

ditto

[Shu Chen, 2015/06/12 08:51:31]

Done.

   OnCaretBoundsChanged();
 
   const size_t caret_blink_ms = Textfield::GetCaretBlinkMs();
   if (caret_blink_ms != 0) {
     cursor_repaint_timer_.Start(FROM_HERE,
         base::TimeDelta::FromMilliseconds(caret_blink_ms), this,
         &Textfield::UpdateCursor);
   }
 
   View::OnFocus();
   SchedulePaint();
 }
 
 void Textfield::OnBlur() {
   GetRenderText()->set_focused(false);
-  GetInputMethod()->OnBlur();
+  if (GetInputMethod())
+    GetInputMethod()->DetachTextInputClient(this);
   cursor_repaint_timer_.Stop();
   if (cursor_visible_) {
     cursor_visible_ = false;
     RepaintCursor();
   }
 
   DestroyTouchSelection();
 
   // Border typically draws focus indicator.
   SchedulePaint();
@@ skipping 428 matching lines @@
   DoInsertChar(ch);
 
   if (text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD &&
       password_reveal_duration_ != base::TimeDelta()) {
     const size_t change_offset = model_->GetCursorPosition();
     DCHECK_GT(change_offset, 0u);
     RevealPasswordChar(change_offset - 1);
   }
 }
 
-gfx::NativeWindow Textfield::GetAttachedWindow() const {
-  // Imagine the following hierarchy.
-  //   [NativeWidget A] - FocusManager
-  //     [View]
-  //     [NativeWidget B]
-  //       [View]
-  //         [View X]
-  // An important thing is that [NativeWidget A] owns Win32 input focus even
-  // when [View X] is logically focused by FocusManager. As a result, an Win32
-  // IME may want to interact with the native view of [NativeWidget A] rather
-  // than that of [NativeWidget B]. This is why we need to call
-  // GetTopLevelWidget() here.
-  return GetWidget()->GetTopLevelWidget()->GetNativeWindow();
-}
-
 ui::TextInputType Textfield::GetTextInputType() const {
   if (read_only() || !enabled())
     return ui::TEXT_INPUT_TYPE_NONE;
   return text_input_type_;
 }
 
 ui::TextInputMode Textfield::GetTextInputMode() const {
   return ui::TEXT_INPUT_MODE_DEFAULT;
 }
 
@@ skipping 263 matching lines @@
     const bool reversed = selection.is_reversed();
     selection.set_start(reversed ? max : min);
     selection.set_end(reversed ? min : max);
     model_->SelectRange(selection);
   }
   UpdateAfterChange(false, true);
   OnAfterUserAction();
 }
 
 void Textfield::OnCaretBoundsChanged() {
-  if (GetInputMethod())
-    GetInputMethod()->OnCaretBoundsChanged(this);
+  if (GetInputMethod() && GetTextInputClient())
+    GetInputMethod()->OnCaretBoundsChanged(GetTextInputClient());

[James Su, 2015/06/12 07:58:50]

ditto

[Shu Chen, 2015/06/12 08:51:31]

Done.

   if (touch_selection_controller_)
     touch_selection_controller_->SelectionChanged();
 }
 
 void Textfield::OnBeforeUserAction() {
   DCHECK(!performing_user_action_);
   performing_user_action_ = true;
   if (controller_)
     controller_->OnBeforeUserAction(this);
 }
@@ skipping 121 matching lines @@
     RequestFocus();
   model_->MoveCursorTo(mouse);
   if (!selection_clipboard_text.empty()) {
     model_->InsertText(selection_clipboard_text);
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
 }
 
 }  // namespace views