| 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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| 11 #include "chrome/browser/about_flags.h" | 11 #include "chrome/browser/about_flags.h" |
| 12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 13 #include "chrome/browser/background/background_mode_manager.h" | 13 #include "chrome/browser/background/background_mode_manager.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" | 14 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" |
| 15 #include "chrome/browser/bookmarks/bookmark_utils.h" | 15 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 16 #include "chrome/browser/browser_process_impl.h" | 16 #include "chrome/browser/browser_process_impl.h" |
| 17 #include "chrome/browser/browser_shutdown.h" | 17 #include "chrome/browser/browser_shutdown.h" |
| 18 #include "chrome/browser/chrome_content_browser_client.h" | 18 #include "chrome/browser/chrome_content_browser_client.h" |
| 19 #include "chrome/browser/component_updater/recovery_component_installer.h" | 19 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 20 #include "chrome/browser/content_settings/host_content_settings_map.h" | 20 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 22 #include "chrome/browser/devtools/devtools_window.h" | 22 #include "chrome/browser/devtools/devtools_window.h" |
| 23 #include "chrome/browser/download/download_prefs.h" | 23 #include "chrome/browser/download/download_prefs.h" |
| 24 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 24 #include "chrome/browser/extensions/api/commands/command_service.h" | 25 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 25 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 26 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 26 #include "chrome/browser/extensions/extension_prefs.h" | 27 #include "chrome/browser/extensions/extension_prefs.h" |
| 27 #include "chrome/browser/extensions/extension_web_ui.h" | 28 #include "chrome/browser/extensions/extension_web_ui.h" |
| 28 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 29 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 29 #include "chrome/browser/first_run/first_run.h" | 30 #include "chrome/browser/first_run/first_run.h" |
| 30 #include "chrome/browser/geolocation/geolocation_prefs.h" | 31 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 31 #include "chrome/browser/google/google_url_tracker.h" | 32 #include "chrome/browser/google/google_url_tracker.h" |
| 32 #include "chrome/browser/google/google_url_tracker_factory.h" | 33 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 33 #include "chrome/browser/gpu/gl_string_manager.h" | 34 #include "chrome/browser/gpu/gl_string_manager.h" |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 309 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
| 309 PrefsTabHelper::RegisterProfilePrefs(registry); | 310 PrefsTabHelper::RegisterProfilePrefs(registry); |
| 310 Profile::RegisterProfilePrefs(registry); | 311 Profile::RegisterProfilePrefs(registry); |
| 311 ProfileImpl::RegisterProfilePrefs(registry); | 312 ProfileImpl::RegisterProfilePrefs(registry); |
| 312 PromoResourceService::RegisterProfilePrefs(registry); | 313 PromoResourceService::RegisterProfilePrefs(registry); |
| 313 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 314 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
| 314 RegisterBrowserUserPrefs(registry); | 315 RegisterBrowserUserPrefs(registry); |
| 315 SessionStartupPref::RegisterProfilePrefs(registry); | 316 SessionStartupPref::RegisterProfilePrefs(registry); |
| 316 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 317 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
| 317 TranslatePrefs::RegisterProfilePrefs(registry); | 318 TranslatePrefs::RegisterProfilePrefs(registry); |
| 319 extensions::ActivityLog::RegisterProfilePrefs(registry); |
| 318 | 320 |
| 319 #if defined(ENABLE_CONFIGURATION_POLICY) | 321 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 320 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 322 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
| 321 #endif | 323 #endif |
| 322 | 324 |
| 323 #if defined(ENABLE_MANAGED_USERS) | 325 #if defined(ENABLE_MANAGED_USERS) |
| 324 ManagedUserService::RegisterProfilePrefs(registry); | 326 ManagedUserService::RegisterProfilePrefs(registry); |
| 325 ManagedUserRegistrationService::RegisterProfilePrefs(registry); | 327 ManagedUserRegistrationService::RegisterProfilePrefs(registry); |
| 326 #endif | 328 #endif |
| 327 | 329 |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 } | 488 } |
| 487 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 489 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 488 | 490 |
| 489 current_version |= GOOGLE_URL_TRACKER_PREFS; | 491 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 490 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 492 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 491 current_version); | 493 current_version); |
| 492 } | 494 } |
| 493 } | 495 } |
| 494 | 496 |
| 495 } // namespace chrome | 497 } // namespace chrome |
| OLD | NEW |