diff options
| author | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 23:14:16 +0000 |
|---|---|---|
| committer | bbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 23:14:16 +0000 |
| commit | 66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0 (patch) | |
| tree | 152e32852a13f1903590918bd5cd68af92b51b4a /chrome/browser/prefs | |
| parent | bda50cd99291986fc13befc0aa8a62d247dceef7 (diff) | |
| download | chromium_src-66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0.zip chromium_src-66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0.tar.gz chromium_src-66c3cb0e9f8f58dbd258e6d31ba8bac5127b55f0.tar.bz2 | |
This patch moves the experiments settings from the user profile to the browser's local state, since these settings correspond to command line switches.
This is a release blocker for NaCl, so we decided to push this through.
TEST=manual
BUG= http://code.google.com/p/nativeclient/issues/detail?id=1322
Review URL: http://codereview.chromium.org/6267009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 4bbd995..8253246 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -86,6 +86,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { void RegisterLocalState(PrefService* local_state) { // Prefs in Local State Browser::RegisterPrefs(local_state); + FlagsUI::RegisterPrefs(local_state); WebCacheManager::RegisterPrefs(local_state); ExternalProtocolHandler::RegisterPrefs(local_state); GoogleURLTracker::RegisterPrefs(local_state); @@ -128,7 +129,6 @@ void RegisterUserPrefs(PrefService* user_prefs) { TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); ExtensionDOMUI::RegisterUserPrefs(user_prefs); ExtensionsUI::RegisterUserPrefs(user_prefs); - FlagsUI::RegisterUserPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); PluginsUI::RegisterUserPrefs(user_prefs); ProfileImpl::RegisterUserPrefs(user_prefs); |