summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield/textfield.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 00:55:13 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 00:55:13 +0000
commit823821512bc23506c8d8b90651cfebe72d314d20 (patch)
tree5cdc7a84d9029a94c8f1c77d985fb0955c4c704b /views/controls/textfield/textfield.cc
parent23a460aaf49d5b2a74ec49275344753d7ec723d1 (diff)
downloadchromium_src-823821512bc23506c8d8b90651cfebe72d314d20.zip
chromium_src-823821512bc23506c8d8b90651cfebe72d314d20.tar.gz
chromium_src-823821512bc23506c8d8b90651cfebe72d314d20.tar.bz2
views: Moves TextfieldController/TextRange into their own headers.
BUG=None TEST=existing unit_tests Review URL: http://codereview.chromium.org/6628037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/textfield/textfield.cc')
-rw-r--r--views/controls/textfield/textfield.cc29
1 files changed, 5 insertions, 24 deletions
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index 8c1003b..b5ab72a 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -16,6 +16,8 @@
#include "ui/gfx/insets.h"
#include "views/controls/native/native_view_host.h"
#include "views/controls/textfield/native_textfield_wrapper.h"
+#include "views/controls/textfield/text_range.h"
+#include "views/controls/textfield/textfield_controller.h"
#include "views/widget/widget.h"
#if defined(OS_LINUX)
@@ -24,8 +26,8 @@
#include "base/win/win_util.h"
// TODO(beng): this should be removed when the OS_WIN hack from
// ViewHierarchyChanged is removed.
-#include "views/controls/textfield/native_textfield_win.h"
#include "views/controls/textfield/native_textfield_views.h"
+#include "views/controls/textfield/native_textfield_win.h"
#include "views/events/event_utils_win.h"
#endif
@@ -35,27 +37,6 @@ namespace views {
const char Textfield::kViewClassName[] = "views/Textfield";
/////////////////////////////////////////////////////////////////////////////
-// TextRange
-
-TextRange::TextRange(size_t start, size_t end)
- : start_(start),
- end_(end) {
-}
-
-size_t TextRange::GetMin() const {
- return std::min(start_, end_);
-}
-
-size_t TextRange::GetMax() const {
- return std::max(start_, end_);
-}
-
-void TextRange::SetRange(size_t start, size_t end) {
- start_ = start;
- end_ = end;
-}
-
-/////////////////////////////////////////////////////////////////////////////
// Textfield
Textfield::Textfield()
@@ -97,11 +78,11 @@ Textfield::Textfield(StyleFlags style)
Textfield::~Textfield() {
}
-void Textfield::SetController(Controller* controller) {
+void Textfield::SetController(TextfieldController* controller) {
controller_ = controller;
}
-Textfield::Controller* Textfield::GetController() const {
+TextfieldController* Textfield::GetController() const {
return controller_;
}