Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 6267009: Move experiments settings (about:flags) from profile to local state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/dom_ui/flags_ui.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 namespace browser { 79 namespace browser {
80 80
81 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { 81 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
82 RegisterLocalState(local_state); 82 RegisterLocalState(local_state);
83 RegisterUserPrefs(user_prefs); 83 RegisterUserPrefs(user_prefs);
84 } 84 }
85 85
86 void RegisterLocalState(PrefService* local_state) { 86 void RegisterLocalState(PrefService* local_state) {
87 // Prefs in Local State 87 // Prefs in Local State
88 Browser::RegisterPrefs(local_state); 88 Browser::RegisterPrefs(local_state);
89 FlagsUI::RegisterPrefs(local_state);
89 WebCacheManager::RegisterPrefs(local_state); 90 WebCacheManager::RegisterPrefs(local_state);
90 ExternalProtocolHandler::RegisterPrefs(local_state); 91 ExternalProtocolHandler::RegisterPrefs(local_state);
91 GoogleURLTracker::RegisterPrefs(local_state); 92 GoogleURLTracker::RegisterPrefs(local_state);
92 IntranetRedirectDetector::RegisterPrefs(local_state); 93 IntranetRedirectDetector::RegisterPrefs(local_state);
93 KeywordEditorController::RegisterPrefs(local_state); 94 KeywordEditorController::RegisterPrefs(local_state);
94 MetricsLog::RegisterPrefs(local_state); 95 MetricsLog::RegisterPrefs(local_state);
95 MetricsService::RegisterPrefs(local_state); 96 MetricsService::RegisterPrefs(local_state);
96 SafeBrowsingService::RegisterPrefs(local_state); 97 SafeBrowsingService::RegisterPrefs(local_state);
97 browser_shutdown::RegisterPrefs(local_state); 98 browser_shutdown::RegisterPrefs(local_state);
98 #if defined(TOOLKIT_VIEWS) 99 #if defined(TOOLKIT_VIEWS)
(...skipping 22 matching lines...) Expand all
121 SessionStartupPref::RegisterUserPrefs(user_prefs); 122 SessionStartupPref::RegisterUserPrefs(user_prefs);
122 Browser::RegisterUserPrefs(user_prefs); 123 Browser::RegisterUserPrefs(user_prefs);
123 PasswordManager::RegisterUserPrefs(user_prefs); 124 PasswordManager::RegisterUserPrefs(user_prefs);
124 chrome_browser_net::RegisterUserPrefs(user_prefs); 125 chrome_browser_net::RegisterUserPrefs(user_prefs);
125 DownloadPrefs::RegisterUserPrefs(user_prefs); 126 DownloadPrefs::RegisterUserPrefs(user_prefs);
126 bookmark_utils::RegisterUserPrefs(user_prefs); 127 bookmark_utils::RegisterUserPrefs(user_prefs);
127 TabContents::RegisterUserPrefs(user_prefs); 128 TabContents::RegisterUserPrefs(user_prefs);
128 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 129 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
129 ExtensionDOMUI::RegisterUserPrefs(user_prefs); 130 ExtensionDOMUI::RegisterUserPrefs(user_prefs);
130 ExtensionsUI::RegisterUserPrefs(user_prefs); 131 ExtensionsUI::RegisterUserPrefs(user_prefs);
131 FlagsUI::RegisterUserPrefs(user_prefs);
132 NewTabUI::RegisterUserPrefs(user_prefs); 132 NewTabUI::RegisterUserPrefs(user_prefs);
133 PluginsUI::RegisterUserPrefs(user_prefs); 133 PluginsUI::RegisterUserPrefs(user_prefs);
134 ProfileImpl::RegisterUserPrefs(user_prefs); 134 ProfileImpl::RegisterUserPrefs(user_prefs);
135 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 135 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
136 PolicyContentSettingsProvider::RegisterUserPrefs(user_prefs); 136 PolicyContentSettingsProvider::RegisterUserPrefs(user_prefs);
137 PrefContentSettingsProvider::RegisterUserPrefs(user_prefs); 137 PrefContentSettingsProvider::RegisterUserPrefs(user_prefs);
138 HostZoomMap::RegisterUserPrefs(user_prefs); 138 HostZoomMap::RegisterUserPrefs(user_prefs);
139 DevToolsManager::RegisterUserPrefs(user_prefs); 139 DevToolsManager::RegisterUserPrefs(user_prefs);
140 PinnedTabCodec::RegisterUserPrefs(user_prefs); 140 PinnedTabCodec::RegisterUserPrefs(user_prefs);
141 ExtensionPrefs::RegisterUserPrefs(user_prefs); 141 ExtensionPrefs::RegisterUserPrefs(user_prefs);
(...skipping 11 matching lines...) Expand all
153 #endif 153 #endif
154 BackgroundContentsService::RegisterUserPrefs(user_prefs); 154 BackgroundContentsService::RegisterUserPrefs(user_prefs);
155 SigninManager::RegisterUserPrefs(user_prefs); 155 SigninManager::RegisterUserPrefs(user_prefs);
156 TemplateURLModel::RegisterUserPrefs(user_prefs); 156 TemplateURLModel::RegisterUserPrefs(user_prefs);
157 InstantController::RegisterUserPrefs(user_prefs); 157 InstantController::RegisterUserPrefs(user_prefs);
158 NetPrefObserver::RegisterPrefs(user_prefs); 158 NetPrefObserver::RegisterPrefs(user_prefs);
159 policy::ProfilePolicyContext::RegisterUserPrefs(user_prefs); 159 policy::ProfilePolicyContext::RegisterUserPrefs(user_prefs);
160 } 160 }
161 161
162 } // namespace browser 162 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/flags_ui.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698