views: Remove NativeTextButton::SetLabel() and replace all call sites with SetText().

Note: This was a TODO added by rogerta@chromium.org

BUG=None
TEST=None

R=sky@chromium.org

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

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

chrome/browser/chromeos/login/eula_view.cc

@@ -382,15 +382,15 @@ void EulaView::UpdateLocalizedStrings() {
   }
 
   // Load other labels from resources.
-  usage_statistics_checkbox_->SetLabel(
+  usage_statistics_checkbox_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_CHECKBOX_ENABLE_LOGGING)));
   learn_more_link_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));
   system_security_settings_link_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING)));
-  continue_button_->SetLabel(UTF16ToWide(
+  continue_button_->SetText(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON)));
-  back_button_->SetLabel(
+  back_button_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_EULA_BACK_BUTTON)));
 }
 

chrome/browser/chromeos/login/new_user_view.cc

@@ -300,7 +300,7 @@ void NewUserView::UpdateLocalizedStringsAndFonts() {
   SetAndCorrectTextfieldFont(password_field_, base_font);
   password_field_->set_text_to_display_when_empty(
       l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD));
-  sign_in_button_->SetLabel(UTF16ToWide(
+  sign_in_button_->SetText(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_LOGIN_BUTTON)));
   if (need_guest_link_) {
     guest_link_->SetFont(base_font);

chrome/browser/ui/views/first_run_search_engine_view.cc

@@ -286,7 +286,7 @@ void FirstRunSearchEngineView::OnTemplateURLServiceChanged() {
     for (it = search_engine_choices_.begin();
          it != search_engine_choices_.end();
          it++) {
-      (*it)->SetLabel((*it)->GetSearchEngine()->short_name());
+      (*it)->SetText((*it)->GetSearchEngine()->short_name());
     }
   }
 

views/controls/button/checkbox.h

@@ -30,10 +30,6 @@ class VIEWS_EXPORT Checkbox : public TextButtonBase {
   virtual void SetChecked(bool checked);
   bool checked() const { return checked_; }
 
-  void SetLabel(const std::wstring& label) {
-    SetText(label);
-  }
-
  protected:
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;

views/controls/button/text_button.h

@@ -407,13 +407,6 @@ class VIEWS_EXPORT NativeTextButton : public TextButton {
   NativeTextButton(ButtonListener* listener);
   NativeTextButton(ButtonListener* listener, const std::wstring& text);
 
-  // Sets/Gets the text to be used as the button's label.
-  // TODO: Remove this function and replace all call sites with SetText().
-  void SetLabel(const std::wstring& label) {
-    SetText(label);
-  }
-  std::wstring label() const { return text(); }
-
   // Overridden from TextButton:
   virtual gfx::Size GetMinimumSize() OVERRIDE;
 

views/controls/message_box_view.cc

@@ -77,7 +77,7 @@ void MessageBoxView::SetCheckBoxLabel(const std::wstring& label) {
   if (!checkbox_)
     checkbox_ = new Checkbox(label);
   else
-    checkbox_->SetLabel(label);
+    checkbox_->SetText(label);
   ResetLayoutManager();
 }
 

views/window/dialog_client_view.cc

@@ -47,7 +47,7 @@ void UpdateButtonHelper(NativeTextButton* button_view,
                         MessageBoxFlags::DialogButton button) {
   std::wstring label = delegate->GetDialogButtonLabel(button);
   if (!label.empty())
-    button_view->SetLabel(label);
+    button_view->SetText(label);
   button_view->SetEnabled(delegate->IsDialogButtonEnabled(button));
   button_view->SetVisible(delegate->IsDialogButtonVisible(button));
 }