diff options
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/options/content_page_gtk.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/options_util.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/options/content_page_view.cc | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 0fd90a4..8422df7 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -801,7 +801,7 @@ void PersonalDataManagerObserver::ShowAutoFillDialog( // Personal Stuff panel askSavePasswords_.Init(prefs::kPasswordManagerEnabled, prefs_, observer_.get()); - formAutofill_.Init(prefs::kFormAutofillEnabled, prefs_, observer_.get()); + formAutofill_.Init(prefs::kAutoFillEnabled, prefs_, observer_.get()); currentTheme_.Init(prefs::kCurrentThemeID, prefs_, observer_.get()); // Under the hood panel @@ -1237,7 +1237,7 @@ const int kDisabledIndex = 1; [self setPasswordManagerEnabledIndex:askSavePasswords_.GetValue() ? kEnabledIndex : kDisabledIndex]; } - if (*prefName == prefs::kFormAutofillEnabled) { + if (*prefName == prefs::kAutoFillEnabled) { [self setFormAutofillEnabledIndex:formAutofill_.GetValue() ? kEnabledIndex : kDisabledIndex]; } diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index cc6b73f..edbb9fc 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -4,6 +4,8 @@ #include "chrome/browser/gtk/options/content_page_gtk.h" +#include <string> + #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -72,7 +74,7 @@ ContentPageGtk::ContentPageGtk(Profile* profile) // Add preferences observers. ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled, profile->GetPrefs(), this); - enable_form_autofill_.Init(prefs::kFormAutofillEnabled, + enable_form_autofill_.Init(prefs::kAutoFillEnabled, profile->GetPrefs(), this); if (browser_defaults::kCanToggleSystemTitleBar) { use_custom_chrome_frame_.Init(prefs::kUseCustomChromeFrame, @@ -124,7 +126,7 @@ void ContentPageGtk::NotifyPrefChanged(const std::wstring* pref_name) { GTK_TOGGLE_BUTTON(passwords_neversave_radio_), TRUE); } } - if (!pref_name || *pref_name == prefs::kFormAutofillEnabled) { + if (!pref_name || *pref_name == prefs::kAutoFillEnabled) { if (enable_form_autofill_.GetValue()) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(form_autofill_enable_radio_), TRUE); diff --git a/chrome/browser/options_util.cc b/chrome/browser/options_util.cc index d7e82ba..b0573b4 100644 --- a/chrome/browser/options_util.cc +++ b/chrome/browser/options_util.cc @@ -43,7 +43,7 @@ void OptionsUtil::ResetToDefaults(Profile* profile) { prefs::kDownloadDefaultDirectory, prefs::kDownloadExtensionsToOpen, prefs::kEnableSpellCheck, - prefs::kFormAutofillEnabled, + prefs::kAutoFillEnabled, prefs::kHomePage, prefs::kHomePageIsNewTabPage, prefs::kMixedContentFiltering, diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 89f6fb2..14bce89 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -207,7 +207,7 @@ void ContentPageView::InitControlLayout() { // Init member prefs so we can update the controls if prefs change. ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled, profile()->GetPrefs(), this); - ask_to_save_form_autofill_.Init(prefs::kFormAutofillEnabled, + ask_to_save_form_autofill_.Init(prefs::kAutoFillEnabled, profile()->GetPrefs(), this); is_using_default_theme_.Init(prefs::kCurrentThemeID, profile()->GetPrefs(), this); @@ -221,7 +221,7 @@ void ContentPageView::NotifyPrefChanged(const std::wstring* pref_name) { passwords_neversave_radio_->SetChecked(true); } } - if (!pref_name || *pref_name == prefs::kFormAutofillEnabled) { + if (!pref_name || *pref_name == prefs::kAutoFillEnabled) { if (ask_to_save_form_autofill_.GetValue()) { form_autofill_enable_radio_->SetChecked(true); } else { |