Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/edit_search_engine_dialog.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/edit_search_engine_dialog.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 63 matching lines @@
 
 base::string16 EditSearchEngineDialog::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(controller_->template_url() ?
       IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE :
       IDS_SEARCH_ENGINES_EDITOR_NEW_WINDOW_TITLE);
 }
 
 bool EditSearchEngineDialog::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK) {
-    return (controller_->IsKeywordValid(keyword_tf_->text()) &&
-            controller_->IsTitleValid(title_tf_->text()) &&
-            controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->text())));
+    return (controller_->IsKeywordValid(keyword_tf_->GetText()) &&
+            controller_->IsTitleValid(title_tf_->GetText()) &&
+            controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->GetText())));
   }
   return true;
 }
 
 bool EditSearchEngineDialog::Cancel() {
   controller_->CleanUpCancelledAdd();
   return true;
 }
 
 bool EditSearchEngineDialog::Accept() {
-  controller_->AcceptAddOrEdit(title_tf_->text(), keyword_tf_->text(),
-                               base::UTF16ToUTF8(url_tf_->text()));
+  controller_->AcceptAddOrEdit(title_tf_->GetText(), keyword_tf_->GetText(),
+                               base::UTF16ToUTF8(url_tf_->GetText()));
   return true;
 }
 
 void EditSearchEngineDialog::ContentsChanged(
     Textfield* sender,
     const base::string16& new_contents) {
   GetDialogClientView()->UpdateDialogButtons();
   UpdateImageViews();
 }
 
@@ skipping 117 matching lines @@
 Textfield* EditSearchEngineDialog::CreateTextfield(const base::string16& text,
                                                    bool lowercase) {
   Textfield* text_field = new Textfield(
       lowercase ? Textfield::STYLE_LOWERCASE : Textfield::STYLE_DEFAULT);
   text_field->SetText(text);
   text_field->SetController(this);
   return text_field;
 }
 
 void EditSearchEngineDialog::UpdateImageViews() {
-  UpdateImageView(keyword_iv_, controller_->IsKeywordValid(keyword_tf_->text()),
-                  IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT);
+  UpdateImageView(keyword_iv_,
+      controller_->IsKeywordValid(keyword_tf_->GetText()),
+      IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT);
   UpdateImageView(url_iv_,
-                  controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->text())),
-                  IDS_SEARCH_ENGINES_INVALID_URL_TT);
-  UpdateImageView(title_iv_, controller_->IsTitleValid(title_tf_->text()),
-                  IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
+      controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->GetText())),
+      IDS_SEARCH_ENGINES_INVALID_URL_TT);
+  UpdateImageView(title_iv_, controller_->IsTitleValid(title_tf_->GetText()),
+      IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
 }
 
 void EditSearchEngineDialog::UpdateImageView(views::ImageView* image_view,
                                              bool is_valid,
                                              int invalid_message_id) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (is_valid) {
     image_view->SetTooltipText(base::string16());
     image_view->SetImage(rb.GetImageSkiaNamed(IDR_INPUT_GOOD));
   } else {
     image_view->SetTooltipText(l10n_util::GetStringUTF16(invalid_message_id));
     image_view->SetImage(rb.GetImageSkiaNamed(IDR_INPUT_ALERT));
   }
 }