Remove the 2-level input method system & InputMethodBridge.

ui/views/cocoa/bridged_native_widget.h

 // Copyright 2014 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_COCOA_BRIDGED_NATIVE_WIDGET_H_
 #define UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/base/ime/input_method_delegate.h"
 #include "ui/compositor/layer_owner.h"
 #import "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #import "ui/views/cocoa/bridged_native_widget_owner.h"
 #import "ui/views/cocoa/cocoa_mouse_capture_delegate.h"
 #import "ui/views/focus/focus_manager.h"
-#include "ui/views/ime/input_method_delegate.h"
 #include "ui/views/views_export.h"
 #include "ui/views/widget/widget.h"
 
 @class BridgedContentView;
 @class ViewsNSWindowDelegate;
 
 namespace ui {
 class InputMethod;
 }
 
 namespace views {
 
 class CocoaMouseCapture;
-class InputMethod;
 class NativeWidgetMac;
 class View;
 
 // A bridge to an NSWindow managed by an instance of NativeWidgetMac or
 // DesktopNativeWidgetMac. Serves as a helper class to bridge requests from the
 // NativeWidgetMac to the Cocoa window. Behaves a bit like an aura::Window.
-class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
-                                         public ui::LayerOwner,
-                                         public internal::InputMethodDelegate,
-                                         public CocoaMouseCaptureDelegate,
-                                         public FocusChangeListener,
-                                         public ui::AcceleratedWidgetMacNSView,
-                                         public BridgedNativeWidgetOwner {
+class VIEWS_EXPORT BridgedNativeWidget
+    : public ui::LayerDelegate,
+      public ui::LayerOwner,
+      public ui::internal::InputMethodDelegate,
+      public CocoaMouseCaptureDelegate,
+      public FocusChangeListener,
+      public ui::AcceleratedWidgetMacNSView,
+      public BridgedNativeWidgetOwner {
  public:
   // Ways of changing the visibility of the bridged NSWindow.
   enum WindowVisibilityState {
     HIDE_WINDOW,               // Hides with -[NSWindow orderOut:].
     SHOW_AND_ACTIVATE_WINDOW,  // Shows with -[NSWindow makeKeyAndOrderFront:].
     SHOW_INACTIVE,             // Shows with -[NSWindow orderWindow:..]. Orders
                                // the window above its parent if it has one.
   };
 
   // Return the size that |window| will take for the given client area |size|,
@@ skipping 79 matching lines @@
   // Called by NSWindowDelegate when the application receives a mouse-down, but
   // before the event is processed by NSWindows. Returning true here will cause
   // the event to be cancelled and reposted at the CGSessionEventTap level. This
   // is used to determine whether a mouse-down should drag the window.
   virtual bool ShouldRepostPendingLeftMouseDown(NSPoint location_in_window);
 
   // Called by NativeWidgetMac when the window size constraints change.
   void OnSizeConstraintsChanged();
 
   // See widget.h for documentation.
-  InputMethod* CreateInputMethod();
-  ui::InputMethod* GetHostInputMethod();
+  ui::InputMethod* GetInputMethod();
 
   // The restored bounds will be derived from the current NSWindow frame unless
   // fullscreen or transitioning between fullscreen states.
   gfx::Rect GetRestoredBounds() const;
 
   // Creates a ui::Compositor which becomes responsible for drawing the window.
   void CreateLayer(ui::LayerType layer_type, bool translucent);
 
   NativeWidgetMac* native_widget_mac() { return native_widget_mac_; }
   BridgedContentView* ns_view() { return bridged_view_; }
   NSWindow* ns_window() { return window_; }
 
   TooltipManager* tooltip_manager() { return tooltip_manager_.get(); }
 
   // The parent widget specified in Widget::InitParams::parent. If non-null, the
   // parent will close children before the parent closes, and children will be
   // raised above their parent when window z-order changes.
   BridgedNativeWidgetOwner* parent() { return parent_; }
   const std::vector<BridgedNativeWidget*>& child_windows() {
     return child_windows_;
   }
 
   bool target_fullscreen_state() const { return target_fullscreen_state_; }
   bool window_visible() { return window_visible_; }
 
-  // Overridden from internal::InputMethodDelegate:
-  void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
+  // Overridden from ui::internal::InputMethodDelegate:
+  bool DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
 
  private:
   // Closes all child windows. BridgedNativeWidget children will be destroyed.
   void RemoveOrDestroyChildren();
 
   // Notify descendants of a visibility change.
   void NotifyVisibilityChangeDown();
 
   // Essentially NativeWidgetMac::GetClientAreaBoundsInScreen().size(), but no
   // coordinate transformations are required from AppKit coordinates.
@@ skipping 87 matching lines @@
   // If true, the window is either visible, or wants to be visible but is
   // currently hidden due to having a hidden parent.
   bool wants_to_be_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_