Remove the 2-level input method system & InputMethodBridge.

ui/views/widget/widget.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 42 matching lines @@
 class InputMethod;
 class Layer;
 class NativeTheme;
 class OSExchangeData;
 class ThemeProvider;
 }
 
 namespace views {
 
 class DesktopWindowTreeHost;
-class InputMethod;
 class NativeWidget;
 class NonClientFrameView;
 class TooltipManager;
 class View;
 class WidgetDelegate;
 class WidgetObserver;
 class WidgetRemovalsObserver;
 
 namespace internal {
 class NativeWidgetPrivate;
@@ skipping 488 matching lines @@
   const ui::NativeTheme* GetNativeTheme() const;
 
   // Returns the FocusManager for this widget.
   // Note that all widgets in a widget hierarchy share the same focus manager.
   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.
   // If the view is non-NULL it can be accessed during the drag by calling
   // dragged_view(). If the view has not been deleted during the drag,
   // OnDragDone() is called on it. |location| is in the widget's coordinate
   // system.
   void RunShellDrag(View* view,
                     const ui::OSExchangeData& data,
                     const gfx::Point& location,
@@ skipping 204 matching lines @@
   void OnNativeWidgetEndUserBoundsChange() override;
   bool HasFocusManager() const override;
   void OnNativeWidgetPaint(const ui::PaintContext& context) override;
   int GetNonClientComponent(const gfx::Point& point) override;
   void OnKeyEvent(ui::KeyEvent* event) override;
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnMouseCaptureLost() override;
   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;
   Widget* AsWidget() override;
   const Widget* AsWidget() const override;
   bool SetInitialFocus(ui::WindowShowState show_state) override;
 
   // Overridden from ui::EventSource:
   ui::EventProcessor* GetEventProcessor() override;
 
@@ skipping 43 matching lines @@
   void SetInitialBounds(const gfx::Rect& bounds);
 
   // Sizes and positions the frameless window just after it is created.
   void SetInitialBoundsForFramelessWindow(const gfx::Rect& bounds);
 
   // Returns the bounds and "show" state from the delegate. Returns true if
   // the delegate wants to use a specified bounds.
   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_;
 
   base::ObserverList<WidgetRemovalsObserver> removals_observers_;
 
   // Non-owned pointer to the Widget's delegate. If a NULL delegate is supplied
   // to Init() a default WidgetDelegate is created.
   WidgetDelegate* widget_delegate_;
 
@@ skipping 44 matching lines @@
 
   // The restored bounds used for the initial show. This is only used if
   // |saved_show_state_| is maximized.
   gfx::Rect initial_restored_bounds_;
 
   // Focus is automatically set to the view provided by the delegate
   // when the widget is shown. Set this value to false to override
   // initial focus for the widget.
   bool focus_on_creation_;
 
-  mutable scoped_ptr<InputMethod> input_method_;
-
   // See |is_top_level()| accessor.
   bool is_top_level_;
 
   // Tracks whether native widget has been initialized.
   bool native_widget_initialized_;
 
   // Whether native widget has been destroyed.
   bool native_widget_destroyed_;
 
   // TODO(beng): Remove NativeWidgetGtk's dependence on these:
@@ skipping 25 matching lines @@
   bool movement_disabled_;
 
   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_