| 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 159 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 160 #endif | 160 #endif |
| 161 | 161 |
| 162 #if defined(OS_ANDROID) | 162 #if defined(OS_ANDROID) |
| 163 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 163 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 164 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h" | 164 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h" |
| 165 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" | 165 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" |
| 166 #include "chrome/browser/android/preferences/browser_prefs_android.h" | 166 #include "chrome/browser/android/preferences/browser_prefs_android.h" |
| 167 #include "chrome/browser/geolocation/geolocation_permission_context_android.h" | 167 #include "chrome/browser/geolocation/geolocation_permission_context_android.h" |
| 168 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" | 168 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" |
| 169 #include "components/cdm/browser/media_drm_storage_impl.h" |
| 169 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h
" | 170 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h
" |
| 170 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.
h" | 171 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.
h" |
| 171 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio
ns_provider.h" | 172 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio
ns_provider.h" |
| 172 #include "components/ntp_tiles/popular_sites_impl.h" | 173 #include "components/ntp_tiles/popular_sites_impl.h" |
| 173 #else | 174 #else |
| 174 #include "chrome/browser/gcm/gcm_product_util.h" | 175 #include "chrome/browser/gcm/gcm_product_util.h" |
| 175 #include "chrome/browser/signin/signin_promo.h" | 176 #include "chrome/browser/signin/signin_promo.h" |
| 176 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 177 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 177 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 178 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 178 #include "chrome/browser/upgrade_detector.h" | 179 #include "chrome/browser/upgrade_detector.h" |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 extensions::CommandService::RegisterProfilePrefs(registry); | 567 extensions::CommandService::RegisterProfilePrefs(registry); |
| 567 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 568 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 568 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 569 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 569 NewTabUI::RegisterProfilePrefs(registry); | 570 NewTabUI::RegisterProfilePrefs(registry); |
| 570 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 571 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 571 PinnedTabCodec::RegisterProfilePrefs(registry); | 572 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 572 signin::RegisterProfilePrefs(registry); | 573 signin::RegisterProfilePrefs(registry); |
| 573 #endif | 574 #endif |
| 574 | 575 |
| 575 #if defined(OS_ANDROID) | 576 #if defined(OS_ANDROID) |
| 577 cdm::MediaDrmStorageImpl::RegisterProfilePrefs(registry); |
| 576 ContentSuggestionsNotifierService::RegisterProfilePrefs(registry); | 578 ContentSuggestionsNotifierService::RegisterProfilePrefs(registry); |
| 577 DownloadSuggestionsProvider::RegisterProfilePrefs(registry); | 579 DownloadSuggestionsProvider::RegisterProfilePrefs(registry); |
| 578 ntp_snippets::ClickBasedCategoryRanker::RegisterProfilePrefs(registry); | 580 ntp_snippets::ClickBasedCategoryRanker::RegisterProfilePrefs(registry); |
| 579 ntp_snippets::PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs( | 581 ntp_snippets::PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs( |
| 580 registry); | 582 registry); |
| 581 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); | 583 ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); |
| 582 #endif // defined(OS_ANDROID) | 584 #endif // defined(OS_ANDROID) |
| 583 | 585 |
| 584 #if !defined(OS_ANDROID) | 586 #if !defined(OS_ANDROID) |
| 585 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 587 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 if (distro_dict && | 788 if (distro_dict && |
| 787 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) { | 789 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) { |
| 788 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay); | 790 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay); |
| 789 } | 791 } |
| 790 #endif // BUILDFLAG(ENABLE_RLZ) | 792 #endif // BUILDFLAG(ENABLE_RLZ) |
| 791 profile_prefs->ClearPref(kDistroDict); | 793 profile_prefs->ClearPref(kDistroDict); |
| 792 } | 794 } |
| 793 } | 795 } |
| 794 | 796 |
| 795 } // namespace chrome | 797 } // namespace chrome |
| OLD | NEW |