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())

[sky, 2015/06/29 02:17:41]

Is it really possible to hit this? I would have assumed we blur before deleting?

[Shu Chen, 2015/06/29 02:56:34]

You're right. The FocusManager should make sure the Textfield is blurred before
it being destroyed.
Detaching it at here is just to double make sure for safety.

Do you insist to remove this? Or replace it with a CHECK/DCHECK?

[sky, 2015/06/29 17:03:49]

DCHECK.

[Shu Chen, 2015/06/30 00:54:06]

Done.

+    GetInputMethod()->DetachTextInputClient(this);
+}
 
 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);
   SetColor(GetTextColor());
   UpdateBackgroundColor();
 }
 
@@ skipping 403 matching lines @@
   if (edit_command == kNoCommand)
     edit_command = GetCommandForKeyEvent(event, HasSelection());
 
   if (!handled && IsCommandIdEnabled(edit_command)) {
     ExecuteCommand(edit_command);
     handled = true;
   }
   return handled;
 }
 
-ui::TextInputClient* Textfield::GetTextInputClient() {
-  return this;
-}
-
 void Textfield::OnGestureEvent(ui::GestureEvent* event) {
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
       RequestFocus();
       ShowImeIfNeeded();
       event->SetHandled();
       break;
     case ui::ET_GESTURE_TAP:
       if (event->details().tap_count() == 1) {
         // If tap is on the selection and touch handles are not present, handles
@@ skipping 255 matching lines @@
 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())
+    GetInputMethod()->SetFocusedTextInputClient(this);
   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 869 matching lines @@
     RequestFocus();
   model_->MoveCursorTo(mouse);
   if (!selection_clipboard_text.empty()) {
     model_->InsertText(selection_clipboard_text);
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
 }
 
 }  // namespace views