Remove the 2-level input method system & InputMethodBridge.

ui/views/controls/prefix_selector.cc

 // Copyright 2013 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/prefix_selector.h"
 
 #include "base/i18n/case_conversion.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/range/range.h"
 #include "ui/views/controls/prefix_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
 const int64 kTimeBeforeClearingMS = 1000;
 
 void ConvertRectToScreen(const views::View* src, gfx::Rect* r) {
   DCHECK(src);
 
   gfx::Point new_origin = r->origin();
   views::View::ConvertPointToScreen(src, &new_origin);
   r->set_origin(new_origin);
 }
 
 }  // namespace
 
 PrefixSelector::PrefixSelector(PrefixDelegate* delegate)
     : prefix_delegate_(delegate) {
 }
 
 PrefixSelector::~PrefixSelector() {
+  ui::InputMethod* input_method = prefix_delegate_->GetInputMethod();
+  if (input_method)
+    input_method->DetachTextInputClient(this);
 }
 
 void PrefixSelector::OnViewBlur() {
   ClearText();
 }
 
 void PrefixSelector::SetCompositionText(
     const ui::CompositionText& composition) {
 }
 
 void PrefixSelector::ConfirmCompositionText() {
 }
 
 void PrefixSelector::ClearCompositionText() {
 }
 
 void PrefixSelector::InsertText(const base::string16& text) {
   OnTextInput(text);
 }
 
 void PrefixSelector::InsertChar(base::char16 ch, int flags) {
   OnTextInput(base::string16(1, ch));
 }
 
-gfx::NativeWindow PrefixSelector::GetAttachedWindow() const {
-  return prefix_delegate_->GetWidget()->GetNativeWindow();
-}
-
 ui::TextInputType PrefixSelector::GetTextInputType() const {
   return ui::TEXT_INPUT_TYPE_TEXT;
 }
 
 ui::TextInputMode PrefixSelector::GetTextInputMode() const {
   return ui::TEXT_INPUT_MODE_DEFAULT;
 }
 
 int PrefixSelector::GetTextInputFlags() const {
   return 0;
@@ skipping 118 matching lines @@
   return (model_text.size() >= lower_text.size()) &&
       (model_text.compare(0, lower_text.size(), lower_text) == 0);
 }
 
 void PrefixSelector::ClearText() {
   current_text_.clear();
   time_of_last_key_ = base::TimeTicks();
 }
 
 }  // namespace views