Remove the 2-level input method system & InputMethodBridge.

ui/views/controls/tree/tree_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/tree/tree_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/prefix_selector.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/tree/tree_view_controller.h"
-#include "ui/views/ime/input_method.h"
 #include "ui/views/resources/grit/views_resources.h"
 
 using ui::TreeModel;
 using ui::TreeModelNode;
 
 namespace views {
 
 // Insets around the view.
 static const int kHorizontalInset = 2;
 static const int kVerticalInset = 2;
@@ skipping 51 matching lines @@
   open_icon_ = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
       (base::i18n::IsRTL() ? IDR_FOLDER_OPEN_RTL
                            : IDR_FOLDER_OPEN)).ToImageSkia();
   text_offset_ = closed_icon_.width() + kImagePadding + kImagePadding +
       kArrowRegionSize;
 }
 
 TreeView::~TreeView() {
   if (model_)
     model_->RemoveObserver(this);
+
+  if (GetInputMethod() && selector_.get()) {
+    // TreeView should have been blurred before destroy.
+    DCHECK(selector_.get() != GetInputMethod()->GetTextInputClient());
+  }
+
   if (focus_manager_) {
     focus_manager_->RemoveFocusChangeListener(this);
     focus_manager_ = NULL;
   }
 }
 
 View* TreeView::CreateParentIfNecessary() {
   ScrollView* scroll_view = ScrollView::CreateScrollViewWithBorder();
   scroll_view->SetContents(this);
   return scroll_view;
@@ skipping 255 matching lines @@
     CancelEdit();
     RequestFocus();
   }
   return true;
 }
 
 bool TreeView::OnMousePressed(const ui::MouseEvent& event) {
   return OnClickOrTap(event);
 }
 
-ui::TextInputClient* TreeView::GetTextInputClient() {
-  if (!selector_)
-    selector_.reset(new PrefixSelector(this));
-  return selector_.get();
-}
-
 void TreeView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP) {
     if (OnClickOrTap(*event))
       event->SetHandled();
   }
 }
 
 void TreeView::ShowContextMenu(const gfx::Point& p,
                                ui::MenuSourceType source_type) {
   if (!model_)
@@ skipping 222 matching lines @@
 
   int min_row = std::max(0, (min_y - kVerticalInset) / row_height_);
   int max_row = (max_y - kVerticalInset) / row_height_;
   if ((max_y - kVerticalInset) % row_height_ != 0)
     max_row++;
   int current_row = root_row();
   PaintRows(canvas, min_row, max_row, &root_, root_depth(), &current_row);
 }
 
 void TreeView::OnFocus() {
-  GetInputMethod()->OnFocus();
+  if (GetInputMethod())
+    GetInputMethod()->SetFocusedTextInputClient(GetPrefixSelector());
   View::OnFocus();
   SchedulePaintForNode(selected_node_);
 
   // Notify the InputMethod so that it knows to query the TextInputClient.
   if (GetInputMethod())
-    GetInputMethod()->OnCaretBoundsChanged(this);
+    GetInputMethod()->OnCaretBoundsChanged(GetPrefixSelector());
 }
 
 void TreeView::OnBlur() {
-  GetInputMethod()->OnBlur();
+  if (GetInputMethod())
+    GetInputMethod()->DetachTextInputClient(GetPrefixSelector());
   SchedulePaintForNode(selected_node_);
   if (selector_)
     selector_->OnViewBlur();
 }
 
 bool TreeView::OnClickOrTap(const ui::LocatedEvent& event) {
   CommitEdit();
   RequestFocus();
 
   int row = (event.y() - kVerticalInset) / row_height_;
@@ skipping 354 matching lines @@
   DCHECK(internal_node);
   if (!internal_node->is_expanded()) {
     if (!internal_node->loaded_children())
       LoadChildren(internal_node);
     internal_node->set_is_expanded(true);
     return_value = true;
   }
   return return_value;
 }
 
+PrefixSelector* TreeView::GetPrefixSelector() {
+  if (!selector_)
+    selector_.reset(new PrefixSelector(this));
+  return selector_.get();
+}
+
 // InternalNode ----------------------------------------------------------------
 
 TreeView::InternalNode::InternalNode()
     : model_node_(NULL),
       loaded_children_(false),
       is_expanded_(false),
       text_width_(0) {
 }
 
 TreeView::InternalNode::~InternalNode() {
@@ skipping 20 matching lines @@
   if (!is_expanded_)
     return max_width;
   for (int i = 0; i < child_count(); ++i) {
     max_width = std::max(max_width,
                          GetChild(i)->GetMaxWidth(indent, depth + 1));
   }
   return max_width;
 }
 
 }  // namespace views