Remove the 2-level input method system & InputMethodBridge.

ui/views/controls/combobox/combobox.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/combobox/combobox.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/color_constants.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/menu_runner_handler.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/controls/prefix_selector.h"
 #include "ui/views/controls/textfield/textfield.h"
-#include "ui/views/ime/input_method.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
 // Menu border widths
 const int kMenuBorderWidthLeft = 1;
@@ skipping 219 matching lines @@
   text_button_->SetVisible(true);
   arrow_button_->SetVisible(true);
   text_button_->SetFocusable(false);
   arrow_button_->SetFocusable(false);
   AddChildView(text_button_);
   AddChildView(arrow_button_);
 }
 
 Combobox::~Combobox() {
   model_->RemoveObserver(this);
+  if (GetTextInputClient() && GetInputMethod())
+    GetInputMethod()->DetachTextInputClient(GetTextInputClient());
 }
 
 // static
 const gfx::FontList& Combobox::GetFontList() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetFontList(ui::ResourceBundle::BaseFont);
 }
 
 void Combobox::SetStyle(Style style) {
   if (style_ == style)
@@ skipping 247 matching lines @@
     }
     case STYLE_ACTION: {
       PaintButtons(canvas);
       PaintText(canvas);
       break;
     }
   }
 }
 
 void Combobox::OnFocus() {
-  GetInputMethod()->OnFocus();
+  if (GetTextInputClient() && GetInputMethod())
+    GetInputMethod()->SetFocusedTextInputClient(GetTextInputClient());
+
   View::OnFocus();
   // Border renders differently when focused.
   SchedulePaint();
 }
 
 void Combobox::OnBlur() {
-  GetInputMethod()->OnBlur();
+  if (GetTextInputClient() && GetInputMethod())
+    GetInputMethod()->DetachTextInputClient(GetTextInputClient());
+
   if (selector_)
     selector_->OnViewBlur();
   // Border renders differently when focused.
   SchedulePaint();
 }
 
 void Combobox::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_COMBO_BOX;
   state->name = accessible_name_;
   state->value = model_->GetItemAt(selected_index_);
@@ skipping 298 matching lines @@
   const ui::NativeTheme* native_theme_for_arrow = GetNativeTheme();
 #endif
 
   ui::NativeTheme::ExtraParams ignored;
   return native_theme_for_arrow->GetPartSize(ui::NativeTheme::kComboboxArrow,
                                              ui::NativeTheme::kNormal,
                                              ignored);
 }
 
 }  // namespace views