OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "chrome/browser/password_manager/password_manager.h" | 51 #include "chrome/browser/password_manager/password_manager.h" |
52 #include "chrome/browser/pepper_flash_settings_manager.h" | 52 #include "chrome/browser/pepper_flash_settings_manager.h" |
53 #include "chrome/browser/plugins/plugin_finder.h" | 53 #include "chrome/browser/plugins/plugin_finder.h" |
54 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 54 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
55 #include "chrome/browser/prefs/pref_registry_syncable.h" | 55 #include "chrome/browser/prefs/pref_registry_syncable.h" |
56 #include "chrome/browser/prefs/pref_service_syncable.h" | 56 #include "chrome/browser/prefs/pref_service_syncable.h" |
57 #include "chrome/browser/prefs/session_startup_pref.h" | 57 #include "chrome/browser/prefs/session_startup_pref.h" |
58 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 58 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
59 #include "chrome/browser/printing/print_dialog_cloud.h" | 59 #include "chrome/browser/printing/print_dialog_cloud.h" |
60 #include "chrome/browser/profiles/chrome_version_service.h" | 60 #include "chrome/browser/profiles/chrome_version_service.h" |
| 61 #include "chrome/browser/profiles/profile.h" |
61 #include "chrome/browser/profiles/profile_impl.h" | 62 #include "chrome/browser/profiles/profile_impl.h" |
62 #include "chrome/browser/profiles/profile_info_cache.h" | 63 #include "chrome/browser/profiles/profile_info_cache.h" |
63 #include "chrome/browser/profiles/profile_manager.h" | 64 #include "chrome/browser/profiles/profile_manager.h" |
64 #include "chrome/browser/renderer_host/web_cache_manager.h" | 65 #include "chrome/browser/renderer_host/web_cache_manager.h" |
65 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 66 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
66 #include "chrome/browser/signin/signin_manager_factory.h" | 67 #include "chrome/browser/signin/signin_manager_factory.h" |
67 #include "chrome/browser/sync/invalidations/invalidator_storage.h" | 68 #include "chrome/browser/sync/invalidations/invalidator_storage.h" |
68 #include "chrome/browser/sync/sync_prefs.h" | 69 #include "chrome/browser/sync/sync_prefs.h" |
69 #include "chrome/browser/task_manager/task_manager.h" | 70 #include "chrome/browser/task_manager/task_manager.h" |
70 #include "chrome/browser/translate/translate_prefs.h" | 71 #include "chrome/browser/translate/translate_prefs.h" |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 // TODO(joi): Get rid of the need for the PrefService parameter, and | 263 // TODO(joi): Get rid of the need for the PrefService parameter, and |
263 // do registration prior to PrefService creation. | 264 // do registration prior to PrefService creation. |
264 | 265 |
265 // User prefs. Please keep this list alphabetized. | 266 // User prefs. Please keep this list alphabetized. |
266 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); | 267 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); |
267 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); | 268 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); |
268 AutofillManager::RegisterUserPrefs(registry); | 269 AutofillManager::RegisterUserPrefs(registry); |
269 BookmarkPromptPrefs::RegisterUserPrefs(registry); | 270 BookmarkPromptPrefs::RegisterUserPrefs(registry); |
270 bookmark_utils::RegisterUserPrefs(registry); | 271 bookmark_utils::RegisterUserPrefs(registry); |
271 BrowserInstantController::RegisterUserPrefs(user_prefs, registry); | 272 BrowserInstantController::RegisterUserPrefs(user_prefs, registry); |
272 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs, registry); | 273 browser_sync::SyncPrefs::RegisterUserPrefs(registry); |
273 ChromeContentBrowserClient::RegisterUserPrefs(registry); | 274 ChromeContentBrowserClient::RegisterUserPrefs(registry); |
274 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); | 275 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); |
275 ChromeVersionService::RegisterUserPrefs(registry); | 276 ChromeVersionService::RegisterUserPrefs(registry); |
276 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( | 277 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( |
277 registry); | 278 registry); |
278 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 279 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
279 DownloadPrefs::RegisterUserPrefs(registry); | 280 DownloadPrefs::RegisterUserPrefs(registry); |
280 extensions::ComponentLoader::RegisterUserPrefs(registry); | 281 extensions::ComponentLoader::RegisterUserPrefs(registry); |
281 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 282 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
282 ExtensionWebUI::RegisterUserPrefs(registry); | 283 ExtensionWebUI::RegisterUserPrefs(registry); |
283 first_run::RegisterUserPrefs(registry); | 284 first_run::RegisterUserPrefs(registry); |
284 HostContentSettingsMap::RegisterUserPrefs(registry); | 285 HostContentSettingsMap::RegisterUserPrefs(registry); |
285 IncognitoModePrefs::RegisterUserPrefs(registry); | 286 IncognitoModePrefs::RegisterUserPrefs(registry); |
286 InstantUI::RegisterUserPrefs(registry); | 287 InstantUI::RegisterUserPrefs(registry); |
287 browser_sync::InvalidatorStorage::RegisterUserPrefs(registry); | 288 browser_sync::InvalidatorStorage::RegisterUserPrefs(registry); |
288 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); | 289 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); |
289 MediaStreamDevicesController::RegisterUserPrefs(registry); | 290 MediaStreamDevicesController::RegisterUserPrefs(registry); |
290 NetPrefObserver::RegisterUserPrefs(registry); | 291 NetPrefObserver::RegisterUserPrefs(registry); |
291 NewTabUI::RegisterUserPrefs(registry); | 292 NewTabUI::RegisterUserPrefs(registry); |
292 PasswordManager::RegisterUserPrefs(registry); | 293 PasswordManager::RegisterUserPrefs(registry); |
293 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); | 294 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); |
294 PrefsTabHelper::RegisterUserPrefs(registry); | 295 PrefsTabHelper::RegisterUserPrefs(registry); |
| 296 Profile::RegisterUserPrefs(registry); |
295 ProfileImpl::RegisterUserPrefs(registry); | 297 ProfileImpl::RegisterUserPrefs(registry); |
296 PromoResourceService::RegisterUserPrefs(registry); | 298 PromoResourceService::RegisterUserPrefs(registry); |
297 ProtocolHandlerRegistry::RegisterUserPrefs(registry); | 299 ProtocolHandlerRegistry::RegisterUserPrefs(registry); |
298 RegisterBrowserUserPrefs(registry); | 300 RegisterBrowserUserPrefs(registry); |
299 SessionStartupPref::RegisterUserPrefs(registry); | 301 SessionStartupPref::RegisterUserPrefs(registry); |
300 TemplateURLPrepopulateData::RegisterUserPrefs(registry); | 302 TemplateURLPrepopulateData::RegisterUserPrefs(registry); |
301 TranslatePrefs::RegisterUserPrefs(registry); | 303 TranslatePrefs::RegisterUserPrefs(registry); |
302 | 304 |
303 #if defined(ENABLE_CONFIGURATION_POLICY) | 305 #if defined(ENABLE_CONFIGURATION_POLICY) |
304 policy::URLBlacklistManager::RegisterUserPrefs(registry); | 306 policy::URLBlacklistManager::RegisterUserPrefs(registry); |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 } | 439 } |
438 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 440 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
439 | 441 |
440 current_version |= GOOGLE_URL_TRACKER_PREFS; | 442 current_version |= GOOGLE_URL_TRACKER_PREFS; |
441 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 443 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
442 current_version); | 444 current_version); |
443 } | 445 } |
444 } | 446 } |
445 | 447 |
446 } // namespace chrome | 448 } // namespace chrome |
OLD | NEW |