Remove the 2-level input method system & InputMethodBridge.

ui/views/controls/menu/submenu_view.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/controls/menu/submenu_view.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_host.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/widget/root_view.h"
@@ skipping 29 matching lines @@
   DCHECK(parent);
   // We'll delete ourselves, otherwise the ScrollView would delete us on close.
   set_owned_by_client();
 }
 
 SubmenuView::~SubmenuView() {
   // The menu may not have been closed yet (it will be hidden, but not
   // necessarily closed).
   Close();
 
+  if (GetInputMethod())
+    GetInputMethod()->DetachTextInputClient(GetPrefixSelector());
+
   delete scroll_view_container_;
 }
 
 int SubmenuView::GetMenuItemCount() {
   int count = 0;
   for (int i = 0; i < child_count(); ++i) {
     if (child_at(i)->id() == MenuItemView::kMenuItemViewID)
       count++;
   }
   return count;
 }
 
 MenuItemView* SubmenuView::GetMenuItemAt(int index) {
   for (int i = 0, count = 0; i < child_count(); ++i) {
     if (child_at(i)->id() == MenuItemView::kMenuItemViewID &&
         count++ == index) {
       return static_cast<MenuItemView*>(child_at(i));
     }
   }
   NOTREACHED();
   return NULL;
 }
 
+PrefixSelector* SubmenuView::GetPrefixSelector() {
+  return &prefix_selector_;
+}
+
 void SubmenuView::ChildPreferredSizeChanged(View* child) {
   if (!resize_open_menu_)
     return;
 
   MenuItemView *item = GetMenuItem();
   MenuController* controller = item->GetMenuController();
 
   if (controller) {
     bool dir;
     gfx::Rect bounds = controller->CalculateMenuBounds(item, false, &dir);
@@ skipping 84 matching lines @@
   return gfx::Size(width, height + insets.height());
 }
 
 void SubmenuView::GetAccessibleState(ui::AXViewState* state) {
   // Inherit most of the state from the parent menu item, except the role.
   if (GetMenuItem())
     GetMenuItem()->GetAccessibleState(state);
   state->role = ui::AX_ROLE_MENU_LIST_POPUP;
 }
 
-ui::TextInputClient* SubmenuView::GetTextInputClient() {
-  return &prefix_selector_;
-}
-
 void SubmenuView::PaintChildren(const ui::PaintContext& context) {
   View::PaintChildren(context);
 
   bool paint_drop_indicator = false;
   if (drop_item_) {
     switch (drop_position_) {
       case MenuDelegate::DROP_NONE:
       case MenuDelegate::DROP_ON:
         break;
       case MenuDelegate::DROP_UNKNOWN:
@@ skipping 308 matching lines @@
   y = std::max(y, 0);
   gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height());
   if (new_vis_bounds != vis_bounds) {
     ScrollRectToVisible(new_vis_bounds);
     return true;
   }
   return false;
 }
 
 }  // namespace views