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

- Remove Views dependencies from text_input_client.h.
- Change namespace from views:: to ui::.

This change is necessary for RenderWidgetHostViewAura to support IME since RWHVA is Views agnostic and cannot directly use classes under views/ime/.

BUG=chromium:97261
TEST=try

Review URL: http://codereview.chromium.org/8509034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109583 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 18 insertions, 22 deletions

diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index b4a98f8..d2a353a 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -288,7 +288,7 @@ void NativeTextfieldGtk::HandleFocus() {
 void NativeTextfieldGtk::HandleBlur() {
 }
 
-TextInputClient* NativeTextfieldGtk::GetTextInputClient() {
+ui::TextInputClient* NativeTextfieldGtk::GetTextInputClient() {
   return NULL;
 }
 
diff --git a/views/controls/textfield/native_textfield_gtk.h b/views/controls/textfield/native_textfield_gtk.h
index e7be873..33b067e 100644
--- a/views/controls/textfield/native_textfield_gtk.h
+++ b/views/controls/textfield/native_textfield_gtk.h
@@ -62,7 +62,7 @@ class NativeTextfieldGtk : public NativeControlGtk,
   virtual bool HandleKeyReleased(const views::KeyEvent& e) OVERRIDE;
   virtual void HandleFocus() OVERRIDE;
   virtual void HandleBlur() OVERRIDE;
-  virtual TextInputClient* GetTextInputClient() OVERRIDE;
+  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
   virtual void ApplyStyleRange(const gfx::StyleRange& style) OVERRIDE;
   virtual void ApplyDefaultStyle() OVERRIDE;
   virtual void ClearEditHistory() OVERRIDE;
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 07725ff..107c95b 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -555,7 +555,7 @@ void NativeTextfieldViews::HandleBlur() {
     touch_selection_controller_->ClientViewLostFocus();
 }
 
-TextInputClient* NativeTextfieldViews::GetTextInputClient() {
+ui::TextInputClient* NativeTextfieldViews::GetTextInputClient() {
   return textfield_->read_only() ? NULL : this;
 }
 
@@ -652,7 +652,7 @@ void NativeTextfieldViews::OnBoundsChanged(const gfx::Rect& previous_bounds) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// NativeTextfieldViews, TextInputClient implementation, private:
+// NativeTextfieldViews, ui::TextInputClient implementation, private:
 
 void NativeTextfieldViews::SetCompositionText(
     const ui::CompositionText& composition) {
@@ -813,10 +813,6 @@ bool NativeTextfieldViews::ChangeTextDirectionAndLayoutAlignment(
   return false;
 }
 
-View* NativeTextfieldViews::GetOwnerViewOfTextInputClient() {
-  return textfield_;
-}
-
 void NativeTextfieldViews::OnCompositionTextConfirmedOrCleared() {
   if (skip_input_method_cancel_composition_)
     return;
diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h
index 17967bb..9f149d8 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -8,6 +8,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
+#include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/font.h"
 #include "views/border.h"
@@ -15,7 +16,6 @@
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/drag_controller.h"
-#include "views/ime/text_input_client.h"
 #include "views/touchui/touch_selection_controller.h"
 #include "views/view.h"
 
@@ -46,7 +46,7 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
                                           public ContextMenuController,
                                           public DragController,
                                           public NativeTextfieldWrapper,
-                                          public TextInputClient,
+                                          public ui::TextInputClient,
                                           public TextfieldViewsModel::Delegate {
  public:
   explicit NativeTextfieldViews(Textfield* parent);
@@ -119,7 +119,7 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
   virtual bool HandleKeyReleased(const KeyEvent& e) OVERRIDE;
   virtual void HandleFocus() OVERRIDE;
   virtual void HandleBlur() OVERRIDE;
-  virtual TextInputClient* GetTextInputClient() OVERRIDE;
+  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
   virtual void ApplyStyleRange(const gfx::StyleRange& style) OVERRIDE;
   virtual void ApplyDefaultStyle() OVERRIDE;
   virtual void ClearEditHistory() OVERRIDE;
@@ -143,7 +143,7 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
   friend class NativeTextfieldViewsTest;
   friend class TouchSelectionControllerImplTest;
 
-  // Overridden from TextInputClient:
+  // Overridden from ui::TextInputClient:
   virtual void SetCompositionText(
       const ui::CompositionText& composition) OVERRIDE;
   virtual void ConfirmCompositionText() OVERRIDE;
@@ -163,7 +163,6 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
   virtual void OnInputMethodChanged() OVERRIDE;
   virtual bool ChangeTextDirectionAndLayoutAlignment(
       base::i18n::TextDirection direction) OVERRIDE;
-  virtual View* GetOwnerViewOfTextInputClient() OVERRIDE;
 
   // Overridden from TextfieldViewsModel::Delegate:
   virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE;
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index f0c24b7..f3a046a 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -17,6 +17,7 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/render_text.h"
@@ -27,7 +28,6 @@
 #include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/ime/mock_input_method.h"
-#include "views/ime/text_input_client.h"
 #include "views/test/test_views_delegate.h"
 #include "views/test/views_test_base.h"
 #include "views/views_delegate.h"
@@ -91,7 +91,7 @@ class TestTextfield : public views::Textfield {
   DISALLOW_COPY_AND_ASSIGN(TestTextfield);
 };
 
-// A helper class for use with TextInputClient::GetTextFromRange().
+// A helper class for use with ui::TextInputClient::GetTextFromRange().
 class GetTextHelper {
  public:
   GetTextHelper() {
@@ -1019,7 +1019,7 @@ TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) {
 
 TEST_F(NativeTextfieldViewsTest, TextInputClientTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
-  TextInputClient* client = textfield_->GetTextInputClient();
+  ui::TextInputClient* client = textfield_->GetTextInputClient();
   EXPECT_TRUE(client);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, client->GetTextInputType());
 
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 025fc40..f1c2dc0 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -374,7 +374,7 @@ void NativeTextfieldWin::HandleFocus() {
 void NativeTextfieldWin::HandleBlur() {
 }
 
-TextInputClient* NativeTextfieldWin::GetTextInputClient() {
+ui::TextInputClient* NativeTextfieldWin::GetTextInputClient() {
   return NULL;
 }
 
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index bb8cb96..459c095 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/views/controls/textfield/native_textfield_win.h
@@ -92,7 +92,7 @@ class NativeTextfieldWin
   virtual bool HandleKeyReleased(const views::KeyEvent& event) OVERRIDE;
   virtual void HandleFocus() OVERRIDE;
   virtual void HandleBlur() OVERRIDE;
-  virtual TextInputClient* GetTextInputClient() OVERRIDE;
+  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
   virtual void ApplyStyleRange(const gfx::StyleRange& style) OVERRIDE;
   virtual void ApplyDefaultStyle() OVERRIDE;
   virtual void ClearEditHistory() OVERRIDE;
diff --git a/views/controls/textfield/native_textfield_wrapper.h b/views/controls/textfield/native_textfield_wrapper.h
index f6b0f8a..f4439da 100644
--- a/views/controls/textfield/native_textfield_wrapper.h
+++ b/views/controls/textfield/native_textfield_wrapper.h
@@ -18,13 +18,13 @@ struct StyleRange;
 
 namespace ui {
 class Range;
+class TextInputClient;
 }  // namespace ui
 
 namespace views {
 
 class KeyEvent;
 class Textfield;
-class TextInputClient;
 class View;
 
 // An interface implemented by an object that provides a platform-native
@@ -132,7 +132,7 @@ class VIEWS_EXPORT NativeTextfieldWrapper {
 
   // Returns the View's TextInputClient instance or NULL if the View doesn't
   // support text input.
-  virtual TextInputClient* GetTextInputClient() = 0;
+  virtual ui::TextInputClient* GetTextInputClient() = 0;
 
   // Applies the |style| to the text specified by its range.
   // See |Textfield::ApplyStyleRange| for detail.
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index 8eaa0de..a8e041e 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -410,7 +410,7 @@ void Textfield::GetAccessibleState(ui::AccessibleViewState* state) {
   state->selection_end = range.end();
 }
 
-TextInputClient* Textfield::GetTextInputClient() {
+ui::TextInputClient* Textfield::GetTextInputClient() {
   return native_wrapper_ ? native_wrapper_->GetTextInputClient() : NULL;
 }
 
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 7e73caf..f6f3567 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -31,6 +31,7 @@ struct StyleRange;
 
 namespace ui {
 class Range;
+class TextInputClient;
 }  // namespace ui
 
 namespace views {
@@ -235,7 +236,7 @@ class VIEWS_EXPORT Textfield : public View {
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
-  virtual TextInputClient* GetTextInputClient() OVERRIDE;
+  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
 
  protected:
   virtual void ViewHierarchyChanged(bool is_add, View* parent,