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

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

Issue 10698111: browser: Move more files into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/prefs/browser_prefs.h ('k') | chrome/browser/prefs/proxy_policy_unittest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "chrome/browser/policy/auto_enrollment_client.h" 100 #include "chrome/browser/policy/auto_enrollment_client.h"
101 #include "chrome/browser/policy/device_status_collector.h" 101 #include "chrome/browser/policy/device_status_collector.h"
102 #else 102 #else
103 #include "chrome/browser/extensions/default_apps.h" 103 #include "chrome/browser/extensions/default_apps.h"
104 #endif 104 #endif
105 105
106 #if defined(USE_ASH) 106 #if defined(USE_ASH)
107 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 107 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
108 #endif 108 #endif
109 109
110 namespace browser { 110 namespace {
111
112 enum MigratedPreferences {
113 NO_PREFS = 0,
114 DNS_PREFS = 1 << 0,
115 WINDOWS_PREFS = 1 << 1,
116 GOOGLE_URL_TRACKER_PREFS = 1 << 2,
117 };
118
119 } // namespace
120
121 namespace chrome {
111 122
112 void RegisterLocalState(PrefService* local_state) { 123 void RegisterLocalState(PrefService* local_state) {
113 // Prefs in Local State 124 // Prefs in Local State
114 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); 125 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
115 126
116 browser_shutdown::RegisterPrefs(local_state); 127 browser_shutdown::RegisterPrefs(local_state);
117 ExternalProtocolHandler::RegisterPrefs(local_state); 128 ExternalProtocolHandler::RegisterPrefs(local_state);
118 geolocation::RegisterPrefs(local_state); 129 geolocation::RegisterPrefs(local_state);
119 IntranetRedirectDetector::RegisterPrefs(local_state); 130 IntranetRedirectDetector::RegisterPrefs(local_state);
120 KeywordEditorController::RegisterPrefs(local_state); 131 KeywordEditorController::RegisterPrefs(local_state);
(...skipping 13 matching lines...) Expand all
134 145
135 #if defined(ENABLE_NOTIFICATIONS) 146 #if defined(ENABLE_NOTIFICATIONS)
136 NotificationPrefsManager::RegisterPrefs(local_state); 147 NotificationPrefsManager::RegisterPrefs(local_state);
137 #endif 148 #endif
138 149
139 #if defined(ENABLE_TASK_MANAGER) 150 #if defined(ENABLE_TASK_MANAGER)
140 TaskManager::RegisterPrefs(local_state); 151 TaskManager::RegisterPrefs(local_state);
141 #endif // defined(ENABLE_TASK_MANAGER) 152 #endif // defined(ENABLE_TASK_MANAGER)
142 153
143 #if defined(TOOLKIT_VIEWS) 154 #if defined(TOOLKIT_VIEWS)
144 chrome::RegisterBrowserViewPrefs(local_state); 155 RegisterBrowserViewPrefs(local_state);
145 chrome::RegisterTabStripLayoutTypePrefs(local_state); 156 RegisterTabStripLayoutTypePrefs(local_state);
146 #endif 157 #endif
147 158
148 #if !defined(OS_ANDROID) 159 #if !defined(OS_ANDROID)
149 AppsPromo::RegisterPrefs(local_state); 160 AppsPromo::RegisterPrefs(local_state);
150 BackgroundModeManager::RegisterPrefs(local_state); 161 BackgroundModeManager::RegisterPrefs(local_state);
151 chrome::RegisterBrowserPrefs(local_state); 162 RegisterBrowserPrefs(local_state);
152 FlagsUI::RegisterPrefs(local_state); 163 FlagsUI::RegisterPrefs(local_state);
153 ManagedMode::RegisterPrefs(local_state); 164 ManagedMode::RegisterPrefs(local_state);
154 PromoResourceService::RegisterPrefs(local_state); 165 PromoResourceService::RegisterPrefs(local_state);
155 UpgradeDetector::RegisterPrefs(local_state); 166 UpgradeDetector::RegisterPrefs(local_state);
156 #endif 167 #endif
157 168
158 #if defined(ENABLE_PRINTING) 169 #if defined(ENABLE_PRINTING)
159 printing::PrintJobManager::RegisterPrefs(local_state); 170 printing::PrintJobManager::RegisterPrefs(local_state);
160 #endif 171 #endif
161 172
162 #if defined(OS_CHROMEOS) 173 #if defined(OS_CHROMEOS)
163 chromeos::AudioHandler::RegisterPrefs(local_state); 174 chromeos::AudioHandler::RegisterPrefs(local_state);
164 chromeos::language_prefs::RegisterPrefs(local_state); 175 chromeos::language_prefs::RegisterPrefs(local_state);
165 chromeos::DataPromoNotification::RegisterPrefs(local_state); 176 chromeos::DataPromoNotification::RegisterPrefs(local_state);
166 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); 177 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
167 chromeos::UserManager::RegisterPrefs(local_state); 178 chromeos::UserManager::RegisterPrefs(local_state);
168 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 179 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
169 chromeos::signed_settings_cache::RegisterPrefs(local_state); 180 chromeos::signed_settings_cache::RegisterPrefs(local_state);
170 chromeos::WizardController::RegisterPrefs(local_state); 181 chromeos::WizardController::RegisterPrefs(local_state);
171 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 182 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
172 policy::DeviceStatusCollector::RegisterPrefs(local_state); 183 policy::DeviceStatusCollector::RegisterPrefs(local_state);
173 #endif 184 #endif
174 185
175 #if defined(OS_MACOSX) 186 #if defined(OS_MACOSX)
176 chrome::RegisterObsoleteOSInfobarPrefs(local_state); 187 RegisterObsoleteOSInfobarPrefs(local_state);
177 confirm_quit::RegisterLocalState(local_state); 188 confirm_quit::RegisterLocalState(local_state);
178 #endif 189 #endif
179 } 190 }
180 191
181 void RegisterUserPrefs(PrefService* user_prefs) { 192 void RegisterUserPrefs(PrefService* user_prefs) {
182 // User prefs 193 // User prefs
183 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); 194 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
184 AutofillManager::RegisterUserPrefs(user_prefs); 195 AutofillManager::RegisterUserPrefs(user_prefs);
185 bookmark_utils::RegisterUserPrefs(user_prefs); 196 bookmark_utils::RegisterUserPrefs(user_prefs);
186 chrome::ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); 197 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs);
187 ChromeVersionService::RegisterUserPrefs(user_prefs); 198 ChromeVersionService::RegisterUserPrefs(user_prefs);
188 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); 199 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
189 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); 200 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
190 DownloadPrefs::RegisterUserPrefs(user_prefs); 201 DownloadPrefs::RegisterUserPrefs(user_prefs);
191 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 202 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
192 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); 203 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
193 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 204 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
194 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 205 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
195 InstantController::RegisterUserPrefs(user_prefs); 206 InstantController::RegisterUserPrefs(user_prefs);
196 NetPrefObserver::RegisterPrefs(user_prefs); 207 NetPrefObserver::RegisterPrefs(user_prefs);
197 NewTabUI::RegisterUserPrefs(user_prefs); 208 NewTabUI::RegisterUserPrefs(user_prefs);
198 PasswordManager::RegisterUserPrefs(user_prefs); 209 PasswordManager::RegisterUserPrefs(user_prefs);
199 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); 210 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
200 PrefsTabHelper::RegisterUserPrefs(user_prefs); 211 PrefsTabHelper::RegisterUserPrefs(user_prefs);
201 ProfileImpl::RegisterUserPrefs(user_prefs); 212 ProfileImpl::RegisterUserPrefs(user_prefs);
202 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); 213 ProtocolHandlerRegistry::RegisterPrefs(user_prefs);
203 SessionStartupPref::RegisterUserPrefs(user_prefs); 214 SessionStartupPref::RegisterUserPrefs(user_prefs);
204 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 215 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
205 TranslatePrefs::RegisterUserPrefs(user_prefs); 216 TranslatePrefs::RegisterUserPrefs(user_prefs);
206 web_intents::RegisterUserPrefs(user_prefs); 217 web_intents::RegisterUserPrefs(user_prefs);
207 218
208 #if defined(ENABLE_CONFIGURATION_POLICY) 219 #if defined(ENABLE_CONFIGURATION_POLICY)
209 policy::URLBlacklistManager::RegisterPrefs(user_prefs); 220 policy::URLBlacklistManager::RegisterPrefs(user_prefs);
210 #endif 221 #endif
211 222
212 #if defined(TOOLKIT_VIEWS) 223 #if defined(TOOLKIT_VIEWS)
213 chrome::RegisterInvertBubbleUserPrefs(user_prefs); 224 RegisterInvertBubbleUserPrefs(user_prefs);
214 #elif defined(TOOLKIT_GTK) 225 #elif defined(TOOLKIT_GTK)
215 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 226 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
216 #endif 227 #endif
217 228
218 #if defined(OS_ANDROID) 229 #if defined(OS_ANDROID)
219 geolocation::RegisterUserPrefs(user_prefs); 230 geolocation::RegisterUserPrefs(user_prefs);
220 #endif 231 #endif
221 232
222 #if defined(USE_ASH) 233 #if defined(USE_ASH)
223 ash::RegisterChromeLauncherUserPrefs(user_prefs); 234 ash::RegisterChromeLauncherUserPrefs(user_prefs);
224 #endif 235 #endif
225 236
226 #if !defined(OS_ANDROID) 237 #if !defined(OS_ANDROID)
227 AppsPromo::RegisterUserPrefs(user_prefs); 238 AppsPromo::RegisterUserPrefs(user_prefs);
228 extensions::CommandService::RegisterUserPrefs(user_prefs); 239 extensions::CommandService::RegisterUserPrefs(user_prefs);
229 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 240 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
230 ExtensionPrefs::RegisterUserPrefs(user_prefs); 241 ExtensionPrefs::RegisterUserPrefs(user_prefs);
231 ExtensionWebUI::RegisterUserPrefs(user_prefs); 242 ExtensionWebUI::RegisterUserPrefs(user_prefs);
232 chrome::RegisterBrowserUserPrefs(user_prefs); 243 RegisterBrowserUserPrefs(user_prefs);
233 chrome::RegisterAutolaunchPrefs(user_prefs); 244 RegisterAutolaunchPrefs(user_prefs);
234 DevToolsWindow::RegisterUserPrefs(user_prefs); 245 DevToolsWindow::RegisterUserPrefs(user_prefs);
235 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); 246 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);
236 PinnedTabCodec::RegisterUserPrefs(user_prefs); 247 PinnedTabCodec::RegisterUserPrefs(user_prefs);
237 PluginsUI::RegisterUserPrefs(user_prefs); 248 PluginsUI::RegisterUserPrefs(user_prefs);
238 PromoResourceService::RegisterUserPrefs(user_prefs); 249 PromoResourceService::RegisterUserPrefs(user_prefs);
239 SyncPromoUI::RegisterUserPrefs(user_prefs); 250 SyncPromoUI::RegisterUserPrefs(user_prefs);
240 #endif 251 #endif
241 252
242 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 253 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
243 default_apps::RegisterUserPrefs(user_prefs); 254 default_apps::RegisterUserPrefs(user_prefs);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 local_state->GetString(prefs::kLastPromptedGoogleURL)); 328 local_state->GetString(prefs::kLastPromptedGoogleURL));
318 } 329 }
319 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
320 331
321 current_version |= GOOGLE_URL_TRACKER_PREFS; 332 current_version |= GOOGLE_URL_TRACKER_PREFS;
322 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
323 current_version); 334 current_version);
324 } 335 }
325 } 336 }
326 337
327 } // namespace browser 338 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.h ('k') | chrome/browser/prefs/proxy_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698