summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 07:16:18 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 07:16:18 +0000
commit49a9c05b2eafc9b4ed09f9e7b54c8a3a1a269afe (patch)
tree9f73ca50ef49a60738516842a59527846116294d /views/controls
parent3e93a658fc5830b9bcffc2d128c7163049a270c1 (diff)
downloadchromium_src-49a9c05b2eafc9b4ed09f9e7b54c8a3a1a269afe.zip
chromium_src-49a9c05b2eafc9b4ed09f9e7b54c8a3a1a269afe.tar.gz
chromium_src-49a9c05b2eafc9b4ed09f9e7b54c8a3a1a269afe.tar.bz2
Implement Menu Delegate for RWHVV, also fine tune the selection controller hooks.
BUG=none TEST=none Review URL: http://codereview.chromium.org/7863018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/textfield/native_textfield_views.cc2
-rw-r--r--views/controls/textfield/native_textfield_views.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 9fad4c4..95434d5 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -699,7 +699,7 @@ void NativeTextfieldViews::InsertChar(char16 ch, int flags) {
OnAfterUserAction();
}
-ui::TextInputType NativeTextfieldViews::GetTextInputType() {
+ui::TextInputType NativeTextfieldViews::GetTextInputType() const {
return textfield_->GetTextInputType();
}
diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h
index 8849a3b..1cfbf27 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -148,7 +148,7 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
virtual void ClearCompositionText() OVERRIDE;
virtual void InsertText(const string16& text) OVERRIDE;
virtual void InsertChar(char16 ch, int flags) OVERRIDE;
- virtual ui::TextInputType GetTextInputType() OVERRIDE;
+ virtual ui::TextInputType GetTextInputType() const OVERRIDE;
virtual gfx::Rect GetCaretBounds() OVERRIDE;
virtual bool HasCompositionText() OVERRIDE;
virtual bool GetTextRange(ui::Range* range) OVERRIDE;