Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1357)

Unified Diff: views/controls/textfield/native_textfield_views.cc

Issue 6628037: views: Moves TextfieldController/TextRange into their own headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/controls/textfield/native_textfield_views.cc
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 775308a85de14833f6679dc0025ed622a0710c83..d6214b21ddcf5ce048d0ab6ddc425eaa68109ce0 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -18,7 +18,9 @@
#include "views/background.h"
#include "views/border.h"
#include "views/controls/menu/menu_2.h"
+#include "views/controls/textfield/text_range.h"
#include "views/controls/textfield/textfield.h"
+#include "views/controls/textfield/textfield_controller.h"
#include "views/controls/textfield/textfield_views_model.h"
#include "views/events/event.h"
#include "views/metrics.h"
@@ -162,7 +164,7 @@ void NativeTextfieldViews::UpdateText() {
UpdateCursorBoundsAndTextOffset();
SchedulePaint();
if (changed) {
- Textfield::Controller* controller = textfield_->GetController();
+ TextfieldController* controller = textfield_->GetController();
if (controller)
controller->ContentsChanged(textfield_, GetText());
}
@@ -175,7 +177,7 @@ void NativeTextfieldViews::AppendText(const string16& text) {
UpdateCursorBoundsAndTextOffset();
SchedulePaint();
- Textfield::Controller* controller = textfield_->GetController();
+ TextfieldController* controller = textfield_->GetController();
if (controller)
controller->ContentsChanged(textfield_, GetText());
}
@@ -291,7 +293,7 @@ size_t NativeTextfieldViews::GetCursorPosition() const {
}
bool NativeTextfieldViews::HandleKeyPressed(const views::KeyEvent& e) {
- Textfield::Controller* controller = textfield_->GetController();
+ TextfieldController* controller = textfield_->GetController();
bool handled = false;
if (controller)
handled = controller->HandleKeyEvent(textfield_, e);
@@ -824,7 +826,7 @@ void NativeTextfieldViews::SetCursorForMouseClick(const views::MouseEvent& e) {
void NativeTextfieldViews::PropagateTextChange() {
textfield_->SyncText();
- Textfield::Controller* controller = textfield_->GetController();
+ TextfieldController* controller = textfield_->GetController();
if (controller)
controller->ContentsChanged(textfield_, GetText());
}
« no previous file with comments | « views/controls/textfield/native_textfield_views.h ('k') | views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698