diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/options/content_page_gtk.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/gtk/options/content_page_gtk.h | 8 | ||||
| -rw-r--r-- | chrome/browser/views/options/content_page_view.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/views/options/content_page_view.h | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index e1aa8be..6d46b92 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -186,15 +186,15 @@ GtkWidget* ContentPageGtk::InitPasswordSavingGroup() { gtk_box_pack_start(GTK_BOX(vbox), passwords_neversave_radio_, FALSE, FALSE, 0); - // Add the exceptions button into its own horizontal box so it does not + // Add the show passwords button into its own horizontal box so it does not // depend on the spacing above. GtkWidget* button_hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing); gtk_container_add(GTK_CONTAINER(vbox), button_hbox); - GtkWidget* passwords_exceptions_button = gtk_button_new_with_label( - l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_EXCEPTIONS).c_str()); - g_signal_connect(passwords_exceptions_button, "clicked", - G_CALLBACK(OnPasswordsExceptionsButtonClicked), this); - gtk_box_pack_start(GTK_BOX(button_hbox), passwords_exceptions_button, FALSE, + GtkWidget* show_passwords_button = gtk_button_new_with_label( + l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS).c_str()); + g_signal_connect(show_passwords_button, "clicked", + G_CALLBACK(OnShowPasswordsButtonClicked), this); + gtk_box_pack_start(GTK_BOX(button_hbox), show_passwords_button, FALSE, FALSE, 0); return vbox; @@ -434,8 +434,8 @@ void ContentPageGtk::OnSystemTitleBarRadioToggled(GtkToggleButton* widget, } // static -void ContentPageGtk::OnPasswordsExceptionsButtonClicked(GtkButton* widget, - ContentPageGtk* page) { +void ContentPageGtk::OnShowPasswordsButtonClicked(GtkButton* widget, + ContentPageGtk* page) { ShowPasswordsExceptionsWindow(page->profile()); } diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h index cbf96d0..610c5ab 100644 --- a/chrome/browser/gtk/options/content_page_gtk.h +++ b/chrome/browser/gtk/options/content_page_gtk.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -66,9 +66,9 @@ class ContentPageGtk : public OptionsPageBase, static void OnSystemTitleBarRadioToggled(GtkToggleButton* widget, ContentPageGtk* page); - // Callback for passwords exceptions button. - static void OnPasswordsExceptionsButtonClicked(GtkButton* widget, - ContentPageGtk* page); + // Callback for show passwords button. + static void OnShowPasswordsButtonClicked(GtkButton* widget, + ContentPageGtk* page); // Callback for password radio buttons. static void OnPasswordRadioToggled(GtkToggleButton* widget, diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 678d28c..bc27afc 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -48,7 +48,7 @@ static views::Background* CreateErrorBackground() { } // namespace ContentPageView::ContentPageView(Profile* profile) - : passwords_exceptions_button_(NULL), + : show_passwords_button_(NULL), passwords_group_(NULL), passwords_asktosave_radio_(NULL), passwords_neversave_radio_(NULL), @@ -107,7 +107,7 @@ void ContentPageView::ButtonPressed( profile()->GetPrefs()); } ask_to_save_form_autofill_.SetValue(enabled); - } else if (sender == passwords_exceptions_button_) { + } else if (sender == show_passwords_button_) { UserMetricsRecordAction("Options_ShowPasswordsExceptions", NULL); PasswordsExceptionsWindowView::Show(profile()); } else if (sender == change_autofill_settings_button_) { @@ -280,8 +280,8 @@ void ContentPageView::InitPasswordSavingGroup() { kPasswordSavingRadioGroup); passwords_neversave_radio_->set_listener(this); passwords_neversave_radio_->SetMultiLine(true); - passwords_exceptions_button_ = new views::NativeButton( - this, l10n_util::GetString(IDS_OPTIONS_PASSWORDS_EXCEPTIONS)); + show_passwords_button_ = new views::NativeButton( + this, l10n_util::GetString(IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS)); using views::GridLayout; using views::ColumnSet; @@ -302,7 +302,7 @@ void ContentPageView::InitPasswordSavingGroup() { layout->AddView(passwords_neversave_radio_); layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing); layout->StartRow(0, single_column_view_set_id); - layout->AddView(passwords_exceptions_button_); + layout->AddView(show_passwords_button_); passwords_group_ = new OptionsGroupView( contents, l10n_util::GetString(IDS_OPTIONS_PASSWORDS_GROUP_NAME), L"", diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h index 3f155ca..aa08199 100644 --- a/chrome/browser/views/options/content_page_view.h +++ b/chrome/browser/views/options/content_page_view.h @@ -80,7 +80,7 @@ class ContentPageView : public OptionsPageView, void InitSyncGroup(); // Controls for the Password Saving group - views::NativeButton* passwords_exceptions_button_; + views::NativeButton* show_passwords_button_; OptionsGroupView* passwords_group_; views::RadioButton* passwords_asktosave_radio_; views::RadioButton* passwords_neversave_radio_; |