summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 04:47:45 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 04:47:45 +0000
commit21e00fd70b48587e074164819c6baac7a870fa10 (patch)
tree3248851e92727e19fde47e4df9ca80ccaaa8110c /views/controls/textfield
parent509d72a798e6643b4e9d3328195f44e00f22e466 (diff)
downloadchromium_src-21e00fd70b48587e074164819c6baac7a870fa10.zip
chromium_src-21e00fd70b48587e074164819c6baac7a870fa10.tar.gz
chromium_src-21e00fd70b48587e074164819c6baac7a870fa10.tar.bz2
Revert 109583 - 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 TBR=yusukes@google.com Review URL: http://codereview.chromium.org/8491035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/textfield')
-rw-r--r--views/controls/textfield/native_textfield_gtk.cc2
-rw-r--r--views/controls/textfield/native_textfield_gtk.h2
-rw-r--r--views/controls/textfield/native_textfield_views.cc8
-rw-r--r--views/controls/textfield/native_textfield_views.h9
-rw-r--r--views/controls/textfield/native_textfield_views_unittest.cc6
-rw-r--r--views/controls/textfield/native_textfield_win.cc2
-rw-r--r--views/controls/textfield/native_textfield_win.h2
-rw-r--r--views/controls/textfield/native_textfield_wrapper.h4
-rw-r--r--views/controls/textfield/textfield.cc2
-rw-r--r--views/controls/textfield/textfield.h3
10 files changed, 22 insertions, 18 deletions
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index d2a353a..b4a98f8 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() {
}
-ui::TextInputClient* NativeTextfieldGtk::GetTextInputClient() {
+TextInputClient* NativeTextfieldGtk::GetTextInputClient() {
return NULL;
}
diff --git a/views/controls/textfield/native_textfield_gtk.h b/views/controls/textfield/native_textfield_gtk.h
index 33b067e..e7be873 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 ui::TextInputClient* GetTextInputClient() OVERRIDE;
+ virtual 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 107c95b..07725ff 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();
}
-ui::TextInputClient* NativeTextfieldViews::GetTextInputClient() {
+TextInputClient* NativeTextfieldViews::GetTextInputClient() {
return textfield_->read_only() ? NULL : this;
}
@@ -652,7 +652,7 @@ void NativeTextfieldViews::OnBoundsChanged(const gfx::Rect& previous_bounds) {
}
///////////////////////////////////////////////////////////////////////////////
-// NativeTextfieldViews, ui::TextInputClient implementation, private:
+// NativeTextfieldViews, TextInputClient implementation, private:
void NativeTextfieldViews::SetCompositionText(
const ui::CompositionText& composition) {
@@ -813,6 +813,10 @@ 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 9f149d8..17967bb 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -8,7 +8,6 @@
#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"
@@ -16,6 +15,7 @@
#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 ui::TextInputClient,
+ public 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 ui::TextInputClient* GetTextInputClient() OVERRIDE;
+ virtual 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 ui::TextInputClient:
+ // Overridden from TextInputClient:
virtual void SetCompositionText(
const ui::CompositionText& composition) OVERRIDE;
virtual void ConfirmCompositionText() OVERRIDE;
@@ -163,6 +163,7 @@ 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 f3a046a..f0c24b7 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -17,7 +17,6 @@
#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"
@@ -28,6 +27,7 @@
#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 ui::TextInputClient::GetTextFromRange().
+// A helper class for use with TextInputClient::GetTextFromRange().
class GetTextHelper {
public:
GetTextHelper() {
@@ -1019,7 +1019,7 @@ TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) {
TEST_F(NativeTextfieldViewsTest, TextInputClientTest) {
InitTextfield(Textfield::STYLE_DEFAULT);
- ui::TextInputClient* client = textfield_->GetTextInputClient();
+ 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 f1c2dc0..025fc40 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() {
}
-ui::TextInputClient* NativeTextfieldWin::GetTextInputClient() {
+TextInputClient* NativeTextfieldWin::GetTextInputClient() {
return NULL;
}
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index 459c095..bb8cb96 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 ui::TextInputClient* GetTextInputClient() OVERRIDE;
+ virtual 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 f4439da..f6b0f8a 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 ui::TextInputClient* GetTextInputClient() = 0;
+ virtual 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 a8e041e..8eaa0de 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();
}
-ui::TextInputClient* Textfield::GetTextInputClient() {
+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 f6f3567..7e73caf 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -31,7 +31,6 @@ struct StyleRange;
namespace ui {
class Range;
-class TextInputClient;
} // namespace ui
namespace views {
@@ -236,7 +235,7 @@ class VIEWS_EXPORT Textfield : public View {
virtual void OnFocus() OVERRIDE;
virtual void OnBlur() OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
- virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
+ virtual TextInputClient* GetTextInputClient() OVERRIDE;
protected:
virtual void ViewHierarchyChanged(bool is_add, View* parent,
generated by cgit v1.1 at 2025-03-03 01:32:00 +0000