diff options
| author | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 22:50:31 +0000 |
|---|---|---|
| committer | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 22:50:31 +0000 |
| commit | b7e991c273b3666a4ffb73b79a20a569580dfa84 (patch) | |
| tree | 6564641c02c1af6a7a24dba1a1b5e4947afcfdc7 /chrome/browser/browser_prefs.cc | |
| parent | a7b29dd44da31770cdea6b298957a6a25446e8a9 (diff) | |
| download | chromium_src-b7e991c273b3666a4ffb73b79a20a569580dfa84.zip chromium_src-b7e991c273b3666a4ffb73b79a20a569580dfa84.tar.gz chromium_src-b7e991c273b3666a4ffb73b79a20a569580dfa84.tar.bz2 | |
Make kCookiePromptExpanded a profile pref rather than a local state pref so it can be synced.
BUG=40483
Review URL: http://codereview.chromium.org/2964003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 04962f8..17a45ee 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -86,7 +86,6 @@ void RegisterLocalState(PrefService* local_state) { #endif UpgradeDetector::RegisterPrefs(local_state); TaskManager::RegisterPrefs(local_state); - CookiePromptModalDialog::RegisterPrefs(local_state); geolocation::RegisterPrefs(local_state); AutoFillManager::RegisterBrowserPrefs(local_state); #if defined(OS_CHROMEOS) @@ -130,6 +129,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { chromeos::Preferences::RegisterUserPrefs(user_prefs); #endif BackgroundContentsService::RegisterUserPrefs(user_prefs); + CookiePromptModalDialog::RegisterUserPrefs(user_prefs); } } // namespace browser |