Remove the 2-level input method system & InputMethodBridge.

ui/views/widget/native_widget_private.h

Index: ui/views/widget/native_widget_private.h
diff --git a/ui/views/widget/native_widget_private.h b/ui/views/widget/native_widget_private.h
index bee16b21178dc164861a69e8b41b7629e13e9a4d..a180953ffc2c03183bb920c54ac17e307098c331 100644
--- a/ui/views/widget/native_widget_private.h
+++ b/ui/views/widget/native_widget_private.h
@@ -23,10 +23,8 @@ class OSExchangeData;
 }
 
 namespace views {
-class InputMethod;
 class TooltipManager;
 namespace internal {
-class InputMethodDelegate;
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetPrivate interface
@@ -133,19 +131,10 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget {
   // Returns true if this native widget is capturing events.
   virtual bool HasCapture() const = 0;
 
-  // Returns the InputMethod for this native widget.
-  // Note that all widgets in a widget hierarchy share the same input method.
-  // TODO(suzhe): rename to GetInputMethod() when NativeWidget implementation
-  // class doesn't inherit Widget anymore.
-  virtual InputMethod* CreateInputMethod() = 0;
-
-  // Returns the InputMethodDelegate for this native widget.
-  virtual InputMethodDelegate* GetInputMethodDelegate() = 0;
-
   // Returns the ui::InputMethod for this native widget.
   // TODO(yukishiino): Rename this method to GetInputMethod once we remove
   // views::InputMethod.

[James Su, 2015/06/16 09:18:33]

This TODO can be removed?

[Shu Chen, 2015/06/17 02:27:52]

Done.

-  virtual ui::InputMethod* GetHostInputMethod() = 0;
+  virtual ui::InputMethod* GetInputMethod() = 0;
 
   // Centers the window and sizes it to the specified size.
   virtual void CenterWindow(const gfx::Size& size) = 0;