Move views/ime/text_input_client.h to ui/base/ime/.

views/ime/input_method_base.cc

 // Copyright (c) 2011 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/base/ime/text_input_client.h"
 #include "views/ime/input_method_base.h"
 #include "views/ime/text_input_type_tracker.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
 #include "base/logging.h"
 
 namespace views {
 
 InputMethodBase::InputMethodBase()
@@ skipping 43 matching lines @@
       GetTextInputType(), widget_);
 }
 
 void InputMethodBase::OnTextInputTypeChanged(View* view) {
   if (IsViewFocused(view)) {
     TextInputTypeTracker::GetInstance()->OnTextInputTypeChanged(
         GetTextInputType(), widget_);
   }
 }
 
-TextInputClient* InputMethodBase::GetTextInputClient() const {
+ui::TextInputClient* InputMethodBase::GetTextInputClient() const {
   return (widget_focused_ && focused_view_) ?
       focused_view_->GetTextInputClient() : NULL;
 }
 
 ui::TextInputType InputMethodBase::GetTextInputType() const {
-  TextInputClient* client = GetTextInputClient();
+  ui::TextInputClient* client = GetTextInputClient();
   return client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE;
 }
 
 bool InputMethodBase::IsMock() const {
   return false;
 }
 
 void InputMethodBase::FocusWillChange(View* focused_before, View* focused) {
   DCHECK_EQ(focused_view_, focused_before);
   FocusedViewWillChange();
   focused_view_ = focused;
   FocusedViewDidChange();
 
   if (widget_focused_) {
     TextInputTypeTracker::GetInstance()->OnTextInputTypeChanged(
         GetTextInputType(), widget_);
   }
 }
 
 bool InputMethodBase::IsViewFocused(View* view) const {
   return widget_focused_ && view && focused_view_ == view;
 }
 
 bool InputMethodBase::IsTextInputTypeNone() const {
   return GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE;
 }
 
 void InputMethodBase::OnInputMethodChanged() const {
-  TextInputClient* client = GetTextInputClient();
+  ui::TextInputClient* client = GetTextInputClient();
   if (client && client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE)
     client->OnInputMethodChanged();
 }
 
 void InputMethodBase::DispatchKeyEventPostIME(const KeyEvent& key) const {
   if (delegate_)
     delegate_->DispatchKeyEventPostIME(key);
 }
 
 bool InputMethodBase::GetCaretBoundsInWidget(gfx::Rect* rect) const {
   DCHECK(rect);
-  TextInputClient* client = GetTextInputClient();
+  ui::TextInputClient* client = GetTextInputClient();
   if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
     return false;
 
   *rect = focused_view_->ConvertRectToWidget(client->GetCaretBounds());
 
   // We need to do coordinate conversion if the focused view is inside a child
   // Widget.
   if (focused_view_->GetWidget() != widget_)
     return Widget::ConvertRect(focused_view_->GetWidget(), widget_, rect);
   return true;
 }
 
 void InputMethodBase::FocusedViewWillChange() {
 }
 
 void InputMethodBase::FocusedViewDidChange() {
 }
 
 }  // namespace views