Remove the 2-level input method system & InputMethodBridge.

ui/views/cocoa/bridged_native_widget.mm

Index: ui/views/cocoa/bridged_native_widget.mm
diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
index a465d24e4211ae97ada810938e8f601b3ecd9e1a..2e1678b1719cd44eb7865b827247ba39b484f1e8 100644
--- a/ui/views/cocoa/bridged_native_widget.mm
+++ b/ui/views/cocoa/bridged_native_widget.mm
@@ -26,8 +26,6 @@
 #include "ui/views/cocoa/tooltip_manager_mac.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #import "ui/views/cocoa/widget_owner_nswindow_adapter.h"
-#include "ui/views/ime/input_method_bridge.h"
-#include "ui/views/ime/null_input_method.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_mac.h"
@@ -708,18 +706,12 @@ void BridgedNativeWidget::OnSizeConstraintsChanged() {
                                     shows_fullscreen_controls);
 }
 
-InputMethod* BridgedNativeWidget::CreateInputMethod() {
-  if (switches::IsTextInputFocusManagerEnabled())
-    return new NullInputMethod();
-
-  return new InputMethodBridge(this, GetHostInputMethod(), true);
-}
-
-ui::InputMethod* BridgedNativeWidget::GetHostInputMethod() {
+ui::InputMethod* BridgedNativeWidget::GetInputMethod() {
   if (!input_method_) {
     // Delegate is NULL because Mac IME does not need DispatchKeyEventPostIME
     // callbacks.
     input_method_ = ui::CreateInputMethod(NULL, nil);

[yukawa, 2015/06/11 21:48:42]

Well if we almost always need to call |OnFocus()| just after CreateInputMethod,
can we modify CreateInputMethod instead?

Option 1.
    UI_BASE_IME_EXPORT scoped_ptr<InputMethod> CreateInputMethod(
        internal::InputMethodDelegate* delegate,
        gfx::AcceleratedWidget widget,
        bool has_initial_focus);

Option 2.
    UI_BASE_IME_EXPORT scoped_ptr<InputMethod> CreateInputMethodAndFocus(
        internal::InputMethodDelegate* delegate,
        gfx::AcceleratedWidget widget);

We should be able to do that in a separate CL.

[Shu Chen, 2015/06/12 03:34:38]

I will do a CL soon to avoid such default-focused behavior.
I put OnFocus() call here to fix some test failures.
Because some tests deal with views::InputMethod which doesn't have
"toplevel_focused" state.
Now they deal with ui::InputMethod which is sensitive about its
"toplevel_focused" state.

+    input_method_->OnFocus();
   }
   return input_method_.get();
 }
@@ -759,16 +751,6 @@ void BridgedNativeWidget::CreateLayer(ui::LayerType layer_type,
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// BridgedNativeWidget, internal::InputMethodDelegate:
-
-void BridgedNativeWidget::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
-  DCHECK(focus_manager_);
-  native_widget_mac_->GetWidget()->OnKeyEvent(const_cast<ui::KeyEvent*>(&key));
-  if (!key.handled())
-    focus_manager_->OnKeyEvent(key);
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, CocoaMouseCaptureDelegate:
 
 void BridgedNativeWidget::PostCapturedEvent(NSEvent* event) {