| 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" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 #include "chrome/browser/search/search.h" | 65 #include "chrome/browser/search/search.h" |
| 66 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 66 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 67 #include "chrome/browser/signin/signin_manager_factory.h" | 67 #include "chrome/browser/signin/signin_manager_factory.h" |
| 68 #include "chrome/browser/signin/signin_promo.h" | 68 #include "chrome/browser/signin/signin_promo.h" |
| 69 #include "chrome/browser/sync/sync_prefs.h" | 69 #include "chrome/browser/sync/sync_prefs.h" |
| 70 #include "chrome/browser/task_manager/task_manager.h" | 70 #include "chrome/browser/task_manager/task_manager.h" |
| 71 #include "chrome/browser/translate/translate_prefs.h" | 71 #include "chrome/browser/translate/translate_prefs.h" |
| 72 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 72 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 73 #include "chrome/browser/ui/app_list/app_list_service.h" | 73 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 74 #include "chrome/browser/ui/autofill/autofill_credit_card_bubble_controller.h" | 74 #include "chrome/browser/ui/autofill/autofill_credit_card_bubble_controller.h" |
| 75 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" | |
| 76 #include "chrome/browser/ui/browser_ui_prefs.h" | 75 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 77 #include "chrome/browser/ui/network_profile_bubble.h" | 76 #include "chrome/browser/ui/network_profile_bubble.h" |
| 78 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 77 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 79 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 78 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 80 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 79 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 81 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 80 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 82 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 81 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 83 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 82 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 84 #include "chrome/browser/ui/webui/flags_ui.h" | 83 #include "chrome/browser/ui/webui/flags_ui.h" |
| 85 #include "chrome/browser/ui/webui/instant_ui.h" | 84 #include "chrome/browser/ui/webui/instant_ui.h" |
| 86 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 85 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 87 #include "chrome/browser/ui/webui/plugins_ui.h" | 86 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 88 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 87 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 89 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 88 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
| 90 #include "chrome/browser/upgrade_detector.h" | 89 #include "chrome/browser/upgrade_detector.h" |
| 91 #include "chrome/browser/web_resource/promo_resource_service.h" | 90 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 92 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" | 91 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" |
| 93 #include "chrome/common/pref_names.h" | 92 #include "chrome/common/pref_names.h" |
| 94 #include "components/autofill/core/browser/autofill_manager.h" | 93 #include "components/autofill/core/browser/autofill_manager.h" |
| 95 #include "components/user_prefs/pref_registry_syncable.h" | 94 #include "components/user_prefs/pref_registry_syncable.h" |
| 96 #include "content/public/browser/render_process_host.h" | 95 #include "content/public/browser/render_process_host.h" |
| 97 | 96 |
| 97 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 98 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
| 99 #endif |
| 100 |
| 98 #if defined(ENABLE_CONFIGURATION_POLICY) | 101 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 99 #include "chrome/browser/policy/browser_policy_connector.h" | 102 #include "chrome/browser/policy/browser_policy_connector.h" |
| 100 #include "chrome/browser/policy/policy_statistics_collector.h" | 103 #include "chrome/browser/policy/policy_statistics_collector.h" |
| 101 #include "chrome/browser/policy/url_blacklist_manager.h" | 104 #include "chrome/browser/policy/url_blacklist_manager.h" |
| 102 #endif | 105 #endif |
| 103 | 106 |
| 104 #if defined(ENABLE_MANAGED_USERS) | 107 #if defined(ENABLE_MANAGED_USERS) |
| 105 #include "chrome/browser/managed_mode/managed_user_service.h" | 108 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 106 #include "chrome/browser/managed_mode/managed_user_sync_service.h" | 109 #include "chrome/browser/managed_mode/managed_user_sync_service.h" |
| 107 #endif | 110 #endif |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 #endif | 284 #endif |
| 282 } | 285 } |
| 283 | 286 |
| 284 // Register prefs applicable to all profiles. | 287 // Register prefs applicable to all profiles. |
| 285 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 288 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 286 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); | 289 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); |
| 287 // User prefs. Please keep this list alphabetized. | 290 // User prefs. Please keep this list alphabetized. |
| 288 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); | 291 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); |
| 289 apps::RegisterProfilePrefs(registry); | 292 apps::RegisterProfilePrefs(registry); |
| 290 autofill::AutofillCreditCardBubbleController::RegisterUserPrefs(registry); | 293 autofill::AutofillCreditCardBubbleController::RegisterUserPrefs(registry); |
| 291 autofill::AutofillDialogControllerImpl::RegisterProfilePrefs(registry); | |
| 292 autofill::AutofillManager::RegisterProfilePrefs(registry); | 294 autofill::AutofillManager::RegisterProfilePrefs(registry); |
| 293 BookmarkPromptPrefs::RegisterProfilePrefs(registry); | 295 BookmarkPromptPrefs::RegisterProfilePrefs(registry); |
| 294 bookmark_utils::RegisterProfilePrefs(registry); | 296 bookmark_utils::RegisterProfilePrefs(registry); |
| 295 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); | 297 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); |
| 296 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 298 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
| 297 ChromeVersionService::RegisterProfilePrefs(registry); | 299 ChromeVersionService::RegisterProfilePrefs(registry); |
| 298 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( | 300 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( |
| 299 registry); | 301 registry); |
| 300 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 302 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
| 301 DownloadPrefs::RegisterProfilePrefs(registry); | 303 DownloadPrefs::RegisterProfilePrefs(registry); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 314 PrefsTabHelper::RegisterProfilePrefs(registry); | 316 PrefsTabHelper::RegisterProfilePrefs(registry); |
| 315 Profile::RegisterProfilePrefs(registry); | 317 Profile::RegisterProfilePrefs(registry); |
| 316 ProfileImpl::RegisterProfilePrefs(registry); | 318 ProfileImpl::RegisterProfilePrefs(registry); |
| 317 PromoResourceService::RegisterProfilePrefs(registry); | 319 PromoResourceService::RegisterProfilePrefs(registry); |
| 318 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 320 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
| 319 RegisterBrowserUserPrefs(registry); | 321 RegisterBrowserUserPrefs(registry); |
| 320 SessionStartupPref::RegisterProfilePrefs(registry); | 322 SessionStartupPref::RegisterProfilePrefs(registry); |
| 321 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 323 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
| 322 TranslatePrefs::RegisterProfilePrefs(registry); | 324 TranslatePrefs::RegisterProfilePrefs(registry); |
| 323 | 325 |
| 326 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 327 autofill::AutofillDialogController::RegisterProfilePrefs(registry); |
| 328 #endif |
| 329 |
| 324 #if defined(ENABLE_CONFIGURATION_POLICY) | 330 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 325 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 331 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
| 326 #endif | 332 #endif |
| 327 | 333 |
| 328 #if defined(ENABLE_MANAGED_USERS) | 334 #if defined(ENABLE_MANAGED_USERS) |
| 329 ManagedUserService::RegisterProfilePrefs(registry); | 335 ManagedUserService::RegisterProfilePrefs(registry); |
| 330 ManagedUserSyncService::RegisterProfilePrefs(registry); | 336 ManagedUserSyncService::RegisterProfilePrefs(registry); |
| 331 #endif | 337 #endif |
| 332 | 338 |
| 333 #if defined(ENABLE_NOTIFICATIONS) | 339 #if defined(ENABLE_NOTIFICATIONS) |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 503 } | 509 } |
| 504 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 510 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 505 | 511 |
| 506 current_version |= GOOGLE_URL_TRACKER_PREFS; | 512 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 507 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 513 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 508 current_version); | 514 current_version); |
| 509 } | 515 } |
| 510 } | 516 } |
| 511 | 517 |
| 512 } // namespace chrome | 518 } // namespace chrome |
| OLD | NEW |