Remove the 2-level input method system & InputMethodBridge.

ui/views/widget/widget.cc

 // 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.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/default_theme_provider.h"
 #include "ui/base/hit_test.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/l10n/l10n_font_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/focus/widget_focus_manager.h"
-#include "ui/views/ime/input_method.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_deletion_observer.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/widget/widget_removals_observer.h"
 #include "ui/views/window/custom_frame_view.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 19 matching lines @@
 // Finally, make a default one.
 NativeWidget* CreateNativeWidget(NativeWidget* native_widget,
                                  internal::NativeWidgetDelegate* delegate) {
   if (!native_widget) {
     native_widget =
         internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
   }
   return native_widget;
 }
 
+void NotifyCaretBoundsChanged(ui::InputMethod* input_method) {
+  if (!input_method)
+    return;
+  ui::TextInputClient* client = input_method->GetTextInputClient();
+  if (client)
+    input_method->OnCaretBoundsChanged(client);
+}
+
 }  // namespace
 
 // A default implementation of WidgetDelegate, used by Widget when no
 // WidgetDelegate is supplied.
 class DefaultWidgetDelegate : public WidgetDelegate {
  public:
   explicit DefaultWidgetDelegate(Widget* widget) : widget_(widget) {
   }
   ~DefaultWidgetDelegate() override {}
 
@@ skipping 680 matching lines @@
   Widget* toplevel_widget = GetTopLevelWidget();
   return toplevel_widget ? toplevel_widget->focus_manager_.get() : NULL;
 }
 
 const FocusManager* Widget::GetFocusManager() const {
   const Widget* toplevel_widget = GetTopLevelWidget();
   return toplevel_widget ? toplevel_widget->focus_manager_.get() : NULL;
 }
 
 ui::TextInputClient* Widget::GetFocusedTextInputClient() {
-  FocusManager* focus_manager = GetFocusManager();
-  View* view = focus_manager ? focus_manager->GetFocusedView() : nullptr;
-  return view ? view->GetTextInputClient() : nullptr;
+  return nullptr;
 }
 
-InputMethod* Widget::GetInputMethod() {
-  return const_cast<InputMethod*>(
-      const_cast<const Widget*>(this)->GetInputMethod());
-}
-
-const InputMethod* Widget::GetInputMethod() const {
+ui::InputMethod* Widget::GetInputMethod() {
   if (is_top_level()) {
-    if (!input_method_.get())
-      input_method_ = const_cast<Widget*>(this)->CreateInputMethod().Pass();
-    return input_method_.get();
+    // Only creates the shared the input method instance on top level widget.
+    return native_widget_private()->GetInputMethod();
   } else {
-    const Widget* toplevel = GetTopLevelWidget();
+    Widget* toplevel = GetTopLevelWidget();
     // If GetTopLevelWidget() returns itself which is not toplevel,
     // the widget is detached from toplevel widget.
     // TODO(oshima): Fix GetTopLevelWidget() to return NULL
     // if there is no toplevel. We probably need to add GetTopMostWidget()
     // to replace some use cases.
-    return (toplevel && toplevel != this) ? toplevel->GetInputMethod() : NULL;
+    return (toplevel && toplevel != this) ? toplevel->GetInputMethod()
+                                          : nullptr;
   }
 }
 
-ui::InputMethod* Widget::GetHostInputMethod() {
-  return native_widget_private()->GetHostInputMethod();
-}
-
 void Widget::RunShellDrag(View* view,
                           const ui::OSExchangeData& data,
                           const gfx::Point& location,
                           int operation,
                           ui::DragDropTypes::DragEventSource source) {
   dragged_view_ = view;
   OnDragWillStart();
 
   WidgetDeletionObserver widget_deletion_observer(this);
   native_widget_->RunShellDrag(view, data, location, operation, source);
@@ skipping 301 matching lines @@
 gfx::Size Widget::GetMinimumSize() const {
   return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size();
 }
 
 gfx::Size Widget::GetMaximumSize() const {
   return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
 }
 
 void Widget::OnNativeWidgetMove() {
   widget_delegate_->OnWidgetMove();
-  View* root = GetRootView();
-  if (root && root->GetFocusManager()) {
-    View* focused_view = root->GetFocusManager()->GetFocusedView();
-    if (focused_view && focused_view->GetInputMethod())
-      focused_view->GetInputMethod()->OnCaretBoundsChanged(focused_view);
-  }
+  NotifyCaretBoundsChanged(GetInputMethod());
+
   FOR_EACH_OBSERVER(WidgetObserver, observers_, OnWidgetBoundsChanged(
     this,
     GetWindowBoundsInScreen()));
 }
 
 void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) {
   View* root = GetRootView();
-  if (root) {
+  if (root)
     root->SetSize(new_size);
-    if (root->GetFocusManager()) {
-      View* focused_view = GetRootView()->GetFocusManager()->GetFocusedView();
-      if (focused_view && focused_view->GetInputMethod())
-        focused_view->GetInputMethod()->OnCaretBoundsChanged(focused_view);
-    }
-  }
+
+  NotifyCaretBoundsChanged(GetInputMethod());
   SaveWindowPlacementIfInitialized();
 
   FOR_EACH_OBSERVER(WidgetObserver, observers_, OnWidgetBoundsChanged(
     this,
     GetWindowBoundsInScreen()));
 }
 
 void Widget::OnNativeWidgetWindowShowStateChanged() {
   SaveWindowPlacementIfInitialized();
 }
@@ skipping 138 matching lines @@
   // We explicitly do not capture here. Not capturing enables multiple widgets
   // to get tap events at the same time. Views (such as tab dragging) may
   // explicitly capture.
   SendEventToProcessor(event);
 }
 
 bool Widget::ExecuteCommand(int command_id) {
   return widget_delegate_->ExecuteWindowsCommand(command_id);
 }
 
-InputMethod* Widget::GetInputMethodDirect() {
-  return input_method_.get();
-}
-
 const std::vector<ui::Layer*>& Widget::GetRootLayers() {
   if (root_layers_dirty_) {
     root_layers_dirty_ = false;
     root_layers_.clear();
     BuildRootLayers(GetRootView(), &root_layers_);
   }
   return root_layers_;
 }
 
 bool Widget::HasHitTestMask() const {
@@ skipping 73 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, protected:
 
 internal::RootView* Widget::CreateRootView() {
   return new internal::RootView(this);
 }
 
 void Widget::DestroyRootView() {
   non_client_view_ = NULL;
   root_view_.reset();
-  // Input method has to be destroyed before focus manager.
-  input_method_.reset();
 }
 
 void Widget::OnDragWillStart() {
 }
 
 void Widget::OnDragComplete() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, private:
@@ skipping 87 matching lines @@
         bounds->set_width(minimum_size.width());
 
       if (bounds->height() < minimum_size.height())
         bounds->set_height(minimum_size.height());
     }
     return true;
   }
   return false;
 }
 
-scoped_ptr<InputMethod> Widget::CreateInputMethod() {
-  scoped_ptr<InputMethod> input_method(native_widget_->CreateInputMethod());
-  if (input_method.get())
-    input_method->Init(this);
-  return input_method.Pass();
-}
-
-void Widget::ReplaceInputMethod(InputMethod* input_method) {
-  input_method_.reset(input_method);
-  input_method->SetDelegate(native_widget_->GetInputMethodDelegate());
-  input_method->Init(this);
-}
-
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views