Chromium Code Reviews| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 #include "components/certificate_transparency/ct_policy_manager.h" | 72 #include "components/certificate_transparency/ct_policy_manager.h" |
| 73 #include "components/content_settings/core/browser/host_content_settings_map.h" | 73 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 74 #include "components/dom_distiller/core/distilled_page_prefs.h" | 74 #include "components/dom_distiller/core/distilled_page_prefs.h" |
| 75 #include "components/flags_ui/pref_service_flags_storage.h" | 75 #include "components/flags_ui/pref_service_flags_storage.h" |
| 76 #include "components/gcm_driver/gcm_channel_status_syncer.h" | 76 #include "components/gcm_driver/gcm_channel_status_syncer.h" |
| 77 #include "components/metrics/metrics_service.h" | 77 #include "components/metrics/metrics_service.h" |
| 78 #include "components/network_time/network_time_tracker.h" | 78 #include "components/network_time/network_time_tracker.h" |
| 79 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" | 79 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" |
| 80 #include "components/ntp_snippets/ntp_snippets_service.h" | 80 #include "components/ntp_snippets/ntp_snippets_service.h" |
| 81 #include "components/ntp_snippets/request_throttler.h" | 81 #include "components/ntp_snippets/request_throttler.h" |
| 82 #include "components/ntp_snippets/user_classifier.h" | |
| 82 #include "components/omnibox/browser/zero_suggest_provider.h" | 83 #include "components/omnibox/browser/zero_suggest_provider.h" |
| 83 #include "components/password_manager/core/browser/password_bubble_experiment.h" | 84 #include "components/password_manager/core/browser/password_bubble_experiment.h" |
| 84 #include "components/password_manager/core/browser/password_manager.h" | 85 #include "components/password_manager/core/browser/password_manager.h" |
| 85 #include "components/policy/core/browser/browser_policy_connector.h" | 86 #include "components/policy/core/browser/browser_policy_connector.h" |
| 86 #include "components/policy/core/browser/url_blacklist_manager.h" | 87 #include "components/policy/core/browser/url_blacklist_manager.h" |
| 87 #include "components/policy/core/common/policy_statistics_collector.h" | 88 #include "components/policy/core/common/policy_statistics_collector.h" |
| 88 #include "components/pref_registry/pref_registry_syncable.h" | 89 #include "components/pref_registry/pref_registry_syncable.h" |
| 89 #include "components/prefs/pref_registry_simple.h" | 90 #include "components/prefs/pref_registry_simple.h" |
| 90 #include "components/prefs/pref_service.h" | 91 #include "components/prefs/pref_service.h" |
| 91 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" | 92 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 457 chrome_prefs::RegisterProfilePrefs(registry); | 458 chrome_prefs::RegisterProfilePrefs(registry); |
| 458 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); | 459 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); |
| 459 DownloadPrefs::RegisterProfilePrefs(registry); | 460 DownloadPrefs::RegisterProfilePrefs(registry); |
| 460 HostContentSettingsMap::RegisterProfilePrefs(registry); | 461 HostContentSettingsMap::RegisterProfilePrefs(registry); |
| 461 IncognitoModePrefs::RegisterProfilePrefs(registry); | 462 IncognitoModePrefs::RegisterProfilePrefs(registry); |
| 462 InstantUI::RegisterProfilePrefs(registry); | 463 InstantUI::RegisterProfilePrefs(registry); |
| 463 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 464 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
| 464 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 465 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
| 465 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 466 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
| 466 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 467 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| 467 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); | |
| 468 ntp_snippets::NTPSnippetsService::RegisterProfilePrefs(registry); | 468 ntp_snippets::NTPSnippetsService::RegisterProfilePrefs(registry); |
| 469 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); | |
| 470 password_bubble_experiment::RegisterPrefs(registry); | 469 password_bubble_experiment::RegisterPrefs(registry); |
| 471 password_manager::PasswordManager::RegisterProfilePrefs(registry); | 470 password_manager::PasswordManager::RegisterProfilePrefs(registry); |
| 472 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 471 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
| 473 PrefsTabHelper::RegisterProfilePrefs(registry); | 472 PrefsTabHelper::RegisterProfilePrefs(registry); |
| 474 Profile::RegisterProfilePrefs(registry); | 473 Profile::RegisterProfilePrefs(registry); |
| 475 ProfileImpl::RegisterProfilePrefs(registry); | 474 ProfileImpl::RegisterProfilePrefs(registry); |
| 476 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 475 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
| 477 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); | 476 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); |
| 478 RegisterBrowserUserPrefs(registry); | 477 RegisterBrowserUserPrefs(registry); |
| 479 SessionStartupPref::RegisterProfilePrefs(registry); | 478 SessionStartupPref::RegisterProfilePrefs(registry); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 526 #if defined(ENABLE_SUPERVISED_USERS) | 525 #if defined(ENABLE_SUPERVISED_USERS) |
| 527 #if !defined(OS_ANDROID) | 526 #if !defined(OS_ANDROID) |
| 528 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); | 527 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); |
| 529 SupervisedUserSyncService::RegisterProfilePrefs(registry); | 528 SupervisedUserSyncService::RegisterProfilePrefs(registry); |
| 530 #endif | 529 #endif |
| 531 ChildAccountService::RegisterProfilePrefs(registry); | 530 ChildAccountService::RegisterProfilePrefs(registry); |
| 532 SupervisedUserService::RegisterProfilePrefs(registry); | 531 SupervisedUserService::RegisterProfilePrefs(registry); |
| 533 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); | 532 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); |
| 534 #endif | 533 #endif |
| 535 | 534 |
| 536 #if BUILDFLAG(ANDROID_JAVA_UI) | 535 #if BUILDFLAG(ANDROID_JAVA_UI) |
|
Marc Treib
2016/09/07 13:23:48
Is this the correct flag, or should it be OS_ANDRO
jkrcal
2016/09/07 14:19:07
I thought this is the right way. I just tried to o
| |
| 537 variations::VariationsService::RegisterProfilePrefs(registry); | 536 variations::VariationsService::RegisterProfilePrefs(registry); |
| 537 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); | |
| 538 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); | |
| 539 ntp_snippets::OfflinePageSuggestionsProvider::RegisterProfilePrefs(registry); | |
| 540 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry); | |
| 538 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); | 541 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); |
| 539 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); | 542 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); |
| 540 NewTabPagePrefs::RegisterProfilePrefs(registry); | 543 NewTabPagePrefs::RegisterProfilePrefs(registry); |
| 541 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 544 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
| 542 #else | 545 #else |
| 543 AppShortcutManager::RegisterProfilePrefs(registry); | 546 AppShortcutManager::RegisterProfilePrefs(registry); |
| 544 DeviceIDFetcher::RegisterProfilePrefs(registry); | 547 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 545 DevToolsWindow::RegisterProfilePrefs(registry); | 548 DevToolsWindow::RegisterProfilePrefs(registry); |
| 546 #if defined(ENABLE_APP_LIST) | 549 #if defined(ENABLE_APP_LIST) |
| 547 DriveAppMapping::RegisterProfilePrefs(registry); | 550 DriveAppMapping::RegisterProfilePrefs(registry); |
| 548 #endif | 551 #endif |
| 549 extensions::CommandService::RegisterProfilePrefs(registry); | 552 extensions::CommandService::RegisterProfilePrefs(registry); |
| 550 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 553 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 551 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 554 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 552 first_run::RegisterProfilePrefs(registry); | 555 first_run::RegisterProfilePrefs(registry); |
| 553 NewTabUI::RegisterProfilePrefs(registry); | 556 NewTabUI::RegisterProfilePrefs(registry); |
| 554 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 557 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 555 PinnedTabCodec::RegisterProfilePrefs(registry); | 558 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 556 signin::RegisterProfilePrefs(registry); | 559 signin::RegisterProfilePrefs(registry); |
| 557 #endif | 560 #endif |
| 558 | 561 |
| 559 #if defined(OS_ANDROID) | 562 #if defined(OS_ANDROID) |
| 560 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); | 563 NotificationPlatformBridgeAndroid::RegisterProfilePrefs(registry); |
| 561 ntp_snippets::OfflinePageSuggestionsProvider::RegisterProfilePrefs(registry); | |
| 562 #else | 564 #else |
| 563 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 565 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 564 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 566 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 565 gcm::RegisterProfilePrefs(registry); | 567 gcm::RegisterProfilePrefs(registry); |
| 566 #endif | 568 #endif |
| 567 | 569 |
| 568 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 570 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 569 default_apps::RegisterProfilePrefs(registry); | 571 default_apps::RegisterProfilePrefs(registry); |
| 570 #endif | 572 #endif |
| 571 | 573 |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 744 DeleteWebRTCIdentityStoreDB(profile); | 746 DeleteWebRTCIdentityStoreDB(profile); |
| 745 profile_prefs->ClearPref(kNetworkPredictionEnabled); | 747 profile_prefs->ClearPref(kNetworkPredictionEnabled); |
| 746 profile_prefs->ClearPref(kDisableSpdy); | 748 profile_prefs->ClearPref(kDisableSpdy); |
| 747 | 749 |
| 748 // Added 8/2016. | 750 // Added 8/2016. |
| 749 profile_prefs->ClearPref(prefs::kStaticEncodings); | 751 profile_prefs->ClearPref(prefs::kStaticEncodings); |
| 750 profile_prefs->ClearPref(prefs::kRecentlySelectedEncoding); | 752 profile_prefs->ClearPref(prefs::kRecentlySelectedEncoding); |
| 751 } | 753 } |
| 752 | 754 |
| 753 } // namespace chrome | 755 } // namespace chrome |
| OLD | NEW |