Make Textfield more portable.

Split off Windows bits into NativeTextfieldWin class obscured behind NativeTextfieldWrapper interface.

The APIs aren't perfectly tidy yet but this is a good first pass.

BUG=none
TEST=make sure you can still edit text fields, run the view unit tests.

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

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

11 files changed, 36 insertions, 36 deletions

diff --git a/chrome/browser/input_window_dialog_win.cc b/chrome/browser/input_window_dialog_win.cc
index 102fc9a..2d606df 100644
--- a/chrome/browser/input_window_dialog_win.cc
+++ b/chrome/browser/input_window_dialog_win.cc
@@ -114,14 +114,14 @@ class ContentView : public views::View,
 bool ContentView::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK &&
-      !delegate_->delegate()->IsValid(text_field_->GetText())) {
+      !delegate_->delegate()->IsValid(text_field_->text())) {
     return false;
   }
   return true;
 }
 
 bool ContentView::Accept() {
-  delegate_->delegate()->InputAccepted(text_field_->GetText());
+  delegate_->delegate()->InputAccepted(text_field_->text());
   return true;
 }
 
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index e1e75ac..01c82c2 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -410,7 +410,7 @@ void BookmarkBubbleView::ApplyEdits() {
   BookmarkModel* model = profile_->GetBookmarkModel();
   BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
   if (node) {
-    const std::wstring new_title = title_tf_->GetText();
+    const std::wstring new_title = title_tf_->text();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       UserMetrics::RecordAction(L"BookmarkBubble_ChangeTitleInBubble",
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index f479997..7825433 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -386,12 +386,12 @@ void BookmarkEditorView::Reset() {
   }
 }
 GURL BookmarkEditorView::GetInputURL() const {
-  std::wstring input = URLFixerUpper::FixupURL(url_tf_.GetText(), L"");
+  std::wstring input = URLFixerUpper::FixupURL(url_tf_.text(), L"");
   return GURL(input);
 }
 
 std::wstring BookmarkEditorView::GetInputTitle() const {
-  return title_tf_.GetText();
+  return title_tf_.text();
 }
 
 void BookmarkEditorView::UserInputChanged() {
@@ -399,7 +399,7 @@ void BookmarkEditorView::UserInputChanged() {
   if (!url.is_valid())
     url_tf_.SetBackgroundColor(kErrorColor);
   else
-    url_tf_.SetDefaultBackgroundColor();
+    url_tf_.UseDefaultBackgroundColor();
   GetDialogClientView()->UpdateDialogButtons();
 }
 
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index e772c5a..1a8293fc 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -579,7 +579,7 @@ void BookmarkManagerView::FileSelectionCanceled(void* params) {
 }
 
 BookmarkTableModel* BookmarkManagerView::CreateSearchTableModel() {
-  std::wstring search_text = search_tf_->GetText();
+  std::wstring search_text = search_tf_->text();
   if (search_text.empty())
     return NULL;
   return BookmarkTableModel::CreateSearchTableModel(GetBookmarkModel(),
@@ -599,13 +599,13 @@ void BookmarkManagerView::SetTableModel(BookmarkTableModel* new_table_model,
   table_model_.reset(new_table_model);
   if (!is_search || (new_table_model && new_table_model->RowCount() > 0)) {
     table_view_->SetAltText(std::wstring());
-  } else if (search_tf_->GetText().empty()) {
+  } else if (search_tf_->text().empty()) {
     table_view_->SetAltText(
         l10n_util::GetString(IDS_BOOKMARK_MANAGER_NO_SEARCH_TEXT));
   } else {
     table_view_->SetAltText(
         l10n_util::GetStringF(IDS_BOOKMARK_MANAGER_NO_RESULTS,
-                              search_tf_->GetText()));
+                              search_tf_->text()));
   }
 }
 
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index b6eb9d3..ac223b6 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -284,7 +284,7 @@ void BugReportView::ItemChanged(views::ComboBox* combo_box,
   description_text_->SetEnabled(!is_phishing_report);
   description_text_->SetReadOnly(is_phishing_report);
   if (is_phishing_report) {
-    old_report_text_ = description_text_->GetText();
+    old_report_text_ = description_text_->text();
     description_text_->SetText(std::wstring());
   } else if (!old_report_text_.empty()) {
     description_text_->SetText(old_report_text_);
@@ -438,7 +438,7 @@ void BugReportView::SendReport() {
                    "name=\"url\"\r\n\r\n");
 
   // convert URL to UTF8
-  std::string report_url = WideToUTF8(page_url_text_->GetText());
+  std::string report_url = WideToUTF8(page_url_text_->text());
   if (report_url.empty()) {
     post_body.append("n/a\r\n");
   } else {
@@ -479,7 +479,7 @@ void BugReportView::SendReport() {
   post_body.append("Content-Disposition: form-data; "
                    "name=\"description\"\r\n\r\n");
 
-  std::string description = WideToUTF8(description_text_->GetText());
+  std::string description = WideToUTF8(description_text_->text());
   if (description.empty()) {
     post_body.append("n/a\r\n");
   } else {
@@ -522,7 +522,7 @@ void BugReportView::SendReport() {
 void BugReportView::ReportPhishing() {
   tab_->controller().LoadURL(
       safe_browsing_util::GeneratePhishingReportUrl(
-          kReportPhishingUrl, WideToUTF8(page_url_text_->GetText())),
+          kReportPhishingUrl, WideToUTF8(page_url_text_->text())),
       GURL(),
       PageTransition::LINK);
 }
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index 56ec93e..debc5947 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -81,7 +81,7 @@ std::wstring EditKeywordController::GetWindowTitle() const {
 bool EditKeywordController::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return (IsKeywordValid() && !title_tf_->GetText().empty() && IsURLValid());
+    return (IsKeywordValid() && !title_tf_->text().empty() && IsURLValid());
   }
   return true;
 }
@@ -99,7 +99,7 @@ bool EditKeywordController::Cancel() {
 bool EditKeywordController::Accept() {
   std::wstring url_string = GetURL();
   DCHECK(!url_string.empty());
-  const std::wstring& keyword = keyword_tf_->GetText();
+  const std::wstring& keyword = keyword_tf_->text();
 
   const TemplateURL* existing =
       profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
@@ -123,7 +123,7 @@ bool EditKeywordController::Accept() {
     // does in a similar situation (updating an existing TemplateURL with
     // data from a new one).
     TemplateURL* modifiable_url = const_cast<TemplateURL*>(template_url_);
-    modifiable_url->set_short_name(title_tf_->GetText());
+    modifiable_url->set_short_name(title_tf_->text());
     modifiable_url->set_keyword(keyword);
     modifiable_url->SetURL(url_string, 0, 0);
     // TemplateURLModel takes ownership of template_url_.
@@ -133,16 +133,16 @@ bool EditKeywordController::Accept() {
     // Adding a new entry via the KeywordEditorView.
     DCHECK(keyword_editor_view_);
     if (keyword_editor_view_)
-      keyword_editor_view_->AddTemplateURL(title_tf_->GetText(),
-                                           keyword_tf_->GetText(),
+      keyword_editor_view_->AddTemplateURL(title_tf_->text(),
+                                           keyword_tf_->text(),
                                            url_string);
   } else {
     // Modifying an entry via the KeywordEditorView.
     DCHECK(keyword_editor_view_);
     if (keyword_editor_view_) {
       keyword_editor_view_->ModifyTemplateURL(template_url_,
-                                              title_tf_->GetText(),
-                                              keyword_tf_->GetText(),
+                                              title_tf_->text(),
+                                              keyword_tf_->text(),
                                               url_string);
     }
   }
@@ -304,7 +304,7 @@ bool EditKeywordController::IsURLValid() const {
 
 std::wstring EditKeywordController::GetURL() const {
   std::wstring url;
-  TrimWhitespace(TemplateURLRef::DisplayURLToURLRef(url_tf_->GetText()),
+  TrimWhitespace(TemplateURLRef::DisplayURLToURLRef(url_tf_->text()),
                  TRIM_ALL, &url);
   if (url.empty())
     return url;
@@ -323,7 +323,7 @@ std::wstring EditKeywordController::GetURL() const {
 }
 
 bool EditKeywordController::IsKeywordValid() const {
-  std::wstring keyword = keyword_tf_->GetText();
+  std::wstring keyword = keyword_tf_->text();
   if (keyword.empty())
     return true;  // Always allow no keyword.
   const TemplateURL* turl_with_keyword =
@@ -335,7 +335,7 @@ void EditKeywordController::UpdateImageViews() {
   UpdateImageView(keyword_iv_, IsKeywordValid(),
                   IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT);
   UpdateImageView(url_iv_, IsURLValid(), IDS_SEARCH_ENGINES_INVALID_URL_TT);
-  UpdateImageView(title_iv_, !title_tf_->GetText().empty(),
+  UpdateImageView(title_iv_, !title_tf_->text().empty(),
                   IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
 }
 
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index 42e0531..960abc8 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -174,7 +174,7 @@ void FindBarView::UpdateForResult(const FindNotificationDetails& result,
   // If we don't have any results and something was passed in, then that means
   // someone pressed F3 while the Find box was closed. In that case we need to
   // repopulate the Find box with what was passed in.
-  std::wstring search_string = find_text_->GetText();
+  std::wstring search_string = find_text_->text();
   if (search_string.empty() && !find_text.empty()) {
     find_text_->SetText(UTF16ToWide(find_text));
     find_text_->SelectAll();
@@ -214,7 +214,7 @@ void FindBarView::UpdateForResult(const FindNotificationDetails& result,
 
 void FindBarView::SetFocusAndSelection() {
   find_text_->RequestFocus();
-  if (!find_text_->GetText().empty()) {
+  if (!find_text_->text().empty()) {
     find_text_->SelectAll();
 
     find_previous_button_->SetEnabled(true);
@@ -398,9 +398,9 @@ void FindBarView::ButtonPressed(views::Button* sender) {
   switch (sender->tag()) {
     case FIND_PREVIOUS_TAG:
     case FIND_NEXT_TAG:
-      if (!find_text_->GetText().empty()) {
+      if (!find_text_->text().empty()) {
         container_->GetFindBarController()->tab_contents()->StartFinding(
-            WideToUTF16(find_text_->GetText()),
+            WideToUTF16(find_text_->text()),
             sender->tag() == FIND_NEXT_TAG,
             false);  // Not case sensitive.
       }
@@ -459,7 +459,7 @@ bool FindBarView::HandleKeystroke(views::Textfield* sender,
 
   if (views::Textfield::IsKeystrokeEnter(key)) {
     // Pressing Return/Enter starts the search (unless text box is empty).
-    std::wstring find_string = find_text_->GetText();
+    std::wstring find_string = find_text_->text();
     if (!find_string.empty()) {
       // Search forwards for enter, backwards for shift-enter.
       container_->GetFindBarController()->tab_contents()->StartFinding(
diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc
index d4e40f8..2cc7ba6 100644
--- a/chrome/browser/views/login_view.cc
+++ b/chrome/browser/views/login_view.cc
@@ -83,11 +83,11 @@ LoginView::~LoginView() {
 }
 
 std::wstring LoginView::GetUsername() {
-  return username_field_->GetText();
+  return username_field_->text();
 }
 
 std::wstring LoginView::GetPassword() {
-  return password_field_->GetText();
+  return password_field_->text();
 }
 
 void LoginView::SetModel(LoginModel* model) {
@@ -107,7 +107,7 @@ void LoginView::ViewHierarchyChanged(bool is_add, View *parent, View *child) {
 
 void LoginView::OnAutofillDataAvailable(const std::wstring& username,
                                         const std::wstring& password) {
-  if (username_field_->GetText().empty()) {
+  if (username_field_->text().empty()) {
     username_field_->SetText(username);
     password_field_->SetText(password);
     username_field_->SelectAll();
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index 24dcaae..797ae34 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -567,7 +567,7 @@ CookiesView::~CookiesView() {
 }
 
 void CookiesView::UpdateSearchResults() {
-  cookies_table_model_->UpdateSearchResults(search_field_->GetText());
+  cookies_table_model_->UpdateSearchResults(search_field_->text());
   remove_all_button_->SetEnabled(cookies_table_model_->RowCount() > 0);
 }
 
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index a7b6806..0723e13 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -570,7 +570,7 @@ void GeneralPageView::ButtonPressed(views::Button* sender) {
   } else if (sender == homepage_use_url_radio_) {
     UserMetricsRecordAction(L"Options_Homepage_UseURL",
                             profile()->GetPrefs());
-    SetHomepage(homepage_use_url_textfield_->GetText());
+    SetHomepage(homepage_use_url_textfield_->text());
     EnableHomepageURLField(true);
   } else if (sender == homepage_show_home_button_checkbox_) {
     bool show_button = homepage_show_home_button_checkbox_->checked();
@@ -615,7 +615,7 @@ void GeneralPageView::ContentsChanged(views::Textfield* sender,
     // through the fixer upper to allow input like "google.com" to be converted
     // to something valid ("http://google.com").
     std::wstring url_string = URLFixerUpper::FixupURL(
-        homepage_use_url_textfield_->GetText(), std::wstring());
+        homepage_use_url_textfield_->text(), std::wstring());
     if (GURL(url_string).is_valid())
       SetHomepage(url_string);
   }
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index 84d9193..74f8329 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -453,7 +453,7 @@ void ShelfItemDialog::PerformModelChange() {
   DCHECK(delegate_);
   GURL url(GetInputURL());
   const std::wstring title =
-      title_field_ ? title_field_->GetText() : std::wstring();
+      title_field_ ? title_field_->text() : std::wstring();
   delegate_->AddBookmark(this, title, url);
 }
 
@@ -519,5 +519,5 @@ void ShelfItemDialog::OnDoubleClick() {
 }
 
 GURL ShelfItemDialog::GetInputURL() const {
-  return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L""));
+  return GURL(URLFixerUpper::FixupURL(url_field_->text(), L""));
 }