diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 23:16:32 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 23:16:32 +0000 |
| commit | 7f37da47fd311312bbad7f019378192b73445999 (patch) | |
| tree | 9899f34a424138b19dbb430a1a581dc1f0ca62b3 | |
| parent | 4e4d41bb2689f322816f12dd8d816c5f87af388f (diff) | |
| download | chromium_src-7f37da47fd311312bbad7f019378192b73445999.zip chromium_src-7f37da47fd311312bbad7f019378192b73445999.tar.gz chromium_src-7f37da47fd311312bbad7f019378192b73445999.tar.bz2 | |
Fix the remaining instance of the obsolete kFormAutofillEnabled.
BUG=36640
TEST=none
Review URL: http://codereview.chromium.org/661393
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40451 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/autocomplete_history_manager.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/autocomplete_history_manager.h | 2 | ||||
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc index 4b98399..63d2aaf 100644 --- a/chrome/browser/autocomplete_history_manager.cc +++ b/chrome/browser/autocomplete_history_manager.cc @@ -18,16 +18,11 @@ // text input element in a form. static const int kMaxAutofillMenuItems = 6; -// static -void AutocompleteHistoryManager::RegisterUserPrefs(PrefService* prefs) { - prefs->RegisterBooleanPref(prefs::kFormAutofillEnabled, true); -} - AutocompleteHistoryManager::AutocompleteHistoryManager( TabContents* tab_contents) : tab_contents_(tab_contents), pending_query_handle_(0), query_id_(0) { - form_autofill_enabled_.Init(prefs::kFormAutofillEnabled, + form_autofill_enabled_.Init(prefs::kAutoFillEnabled, profile()->GetPrefs(), NULL); } diff --git a/chrome/browser/autocomplete_history_manager.h b/chrome/browser/autocomplete_history_manager.h index b2e37f5..1629f23 100644 --- a/chrome/browser/autocomplete_history_manager.h +++ b/chrome/browser/autocomplete_history_manager.h @@ -42,8 +42,6 @@ class AutocompleteHistoryManager virtual void OnWebDataServiceRequestDone(WebDataService::Handle h, const WDTypedResult* result); - static void RegisterUserPrefs(PrefService* prefs); - private: void CancelPendingQuery(); void StoreFormEntriesInWebDatabase(const webkit_glue::FormFieldValues& form); diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 1209f9b..cffa4b7 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -4,7 +4,6 @@ #include "chrome/browser/browser_prefs.h" -#include "chrome/browser/autocomplete_history_manager.h" #include "chrome/browser/autofill/autofill_manager.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" @@ -96,7 +95,6 @@ void RegisterUserPrefs(PrefService* user_prefs) { DownloadManager::RegisterUserPrefs(user_prefs); SSLManager::RegisterUserPrefs(user_prefs); bookmark_utils::RegisterUserPrefs(user_prefs); - AutocompleteHistoryManager::RegisterUserPrefs(user_prefs); TabContents::RegisterUserPrefs(user_prefs); TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); ExtensionDOMUI::RegisterUserPrefs(user_prefs); |