Remove the 2-level input method system & InputMethodBridge.

ui/views/widget/widget.h

Index: ui/views/widget/widget.h
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index b418a47f2fc6fec176b89ee293f1ed1396d3a0d0..320332bec2461bd309d694e3651eabc7ba38c712 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -60,7 +60,6 @@ class ThemeProvider;
 namespace views {
 
 class DesktopWindowTreeHost;
-class InputMethod;
 class NativeWidget;
 class NonClientFrameView;
 class TooltipManager;
@@ -566,18 +565,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   FocusManager* GetFocusManager();
   const FocusManager* GetFocusManager() const;
 
-  // Returns the focused text input client within this widget.
-  ui::TextInputClient* GetFocusedTextInputClient();
-
-  // Returns the InputMethod for this widget.
-  // Note that all widgets in a widget hierarchy share the same input method.
-  InputMethod* GetInputMethod();
-  const InputMethod* GetInputMethod() const;
-
   // Returns the ui::InputMethod for this widget.
-  // TODO(yukishiino): Rename this method to GetInputMethod once we remove
-  // views::InputMethod.
-  ui::InputMethod* GetHostInputMethod();
+  ui::InputMethod* GetInputMethod();
 
   // Starts a drag operation for the specified view. This blocks until the drag
   // operation completes. |view| can be NULL.
@@ -802,7 +791,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   bool ExecuteCommand(int command_id) override;
-  InputMethod* GetInputMethodDirect() override;
   const std::vector<ui::Layer*>& GetRootLayers() override;
   bool HasHitTestMask() const override;
   void GetHitTestMask(gfx::Path* mask) const override;
@@ -866,14 +854,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   bool GetSavedWindowPlacement(gfx::Rect* bounds,
                                ui::WindowShowState* show_state);
 
-  // Creates and initializes a new InputMethod and returns it, otherwise null.
-  scoped_ptr<InputMethod> CreateInputMethod();
-
-  // Sets a different InputMethod instance to this widget. The instance
-  // must not be initialized, the ownership will be assumed by the widget.
-  // It's only for testing purpose.
-  void ReplaceInputMethod(InputMethod* input_method);
-
   internal::NativeWidgetPrivate* native_widget_;
 
   base::ObserverList<WidgetObserver> observers_;
@@ -938,8 +918,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   // initial focus for the widget.
   bool focus_on_creation_;
 
-  mutable scoped_ptr<InputMethod> input_method_;
-
   // See |is_top_level()| accessor.
   bool is_top_level_;