| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/prefs/browser_prefs.h" | 5 #include "ios/chrome/browser/prefs/browser_prefs.h" |
| 6 | 6 |
| 7 #include "components/autofill/core/browser/autofill_manager.h" | 7 #include "components/autofill/core/browser/autofill_manager.h" |
| 8 #include "components/browsing_data/core/pref_names.h" | 8 #include "components/browsing_data/core/pref_names.h" |
| 9 #include "components/content_settings/core/browser/host_content_settings_map.h" | 9 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 10 #include "components/dom_distiller/core/distilled_page_prefs.h" | 10 #include "components/dom_distiller/core/distilled_page_prefs.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "ios/chrome/browser/desktop_promotion/desktop_promotion_sync_service.h" | 42 #include "ios/chrome/browser/desktop_promotion/desktop_promotion_sync_service.h" |
| 43 #include "ios/chrome/browser/first_run/first_run.h" | 43 #include "ios/chrome/browser/first_run/first_run.h" |
| 44 #import "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h" | 44 #import "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h" |
| 45 #import "ios/chrome/browser/memory/memory_debugger_manager.h" | 45 #import "ios/chrome/browser/memory/memory_debugger_manager.h" |
| 46 #import "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h" | 46 #import "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h" |
| 47 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" | 47 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" |
| 48 #include "ios/chrome/browser/notification_promo.h" | 48 #include "ios/chrome/browser/notification_promo.h" |
| 49 #include "ios/chrome/browser/physical_web/physical_web_prefs_registration.h" | 49 #include "ios/chrome/browser/physical_web/physical_web_prefs_registration.h" |
| 50 #include "ios/chrome/browser/pref_names.h" | 50 #include "ios/chrome/browser/pref_names.h" |
| 51 #include "ios/chrome/browser/signin/signin_manager_factory.h" | 51 #include "ios/chrome/browser/signin/signin_manager_factory.h" |
| 52 #import "ios/chrome/browser/ui/bookmarks/bookmark_collection_view.h" |
| 52 #import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" | 53 #import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" |
| 53 #import "ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h" | 54 #import "ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h" |
| 54 #include "ios/chrome/browser/voice/voice_search_prefs_registration.h" | 55 #include "ios/chrome/browser/voice/voice_search_prefs_registration.h" |
| 55 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" | 56 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" |
| 56 #include "ui/base/l10n/l10n_util.h" | 57 #include "ui/base/l10n/l10n_util.h" |
| 57 | 58 |
| 58 #if !defined(__has_feature) || !__has_feature(objc_arc) | 59 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 59 #error "This file requires ARC support." | 60 #error "This file requires ARC support." |
| 60 #endif | 61 #endif |
| 61 | 62 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 115 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |
| 115 syncer::SyncPrefs::RegisterProfilePrefs(registry); | 116 syncer::SyncPrefs::RegisterProfilePrefs(registry); |
| 116 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 117 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
| 117 translate::LanguageModel::RegisterProfilePrefs(registry); | 118 translate::LanguageModel::RegisterProfilePrefs(registry); |
| 118 translate::TranslatePrefs::RegisterProfilePrefs(registry); | 119 translate::TranslatePrefs::RegisterProfilePrefs(registry); |
| 119 variations::VariationsService::RegisterProfilePrefs(registry); | 120 variations::VariationsService::RegisterProfilePrefs(registry); |
| 120 ZeroSuggestProvider::RegisterProfilePrefs(registry); | 121 ZeroSuggestProvider::RegisterProfilePrefs(registry); |
| 121 DesktopPromotionSyncService::RegisterDesktopPromotionUserPrefs(registry); | 122 DesktopPromotionSyncService::RegisterDesktopPromotionUserPrefs(registry); |
| 122 RegisterVoiceSearchBrowserStatePrefs(registry); | 123 RegisterVoiceSearchBrowserStatePrefs(registry); |
| 123 | 124 |
| 125 [BookmarkCollectionView registerBrowserStatePrefs:registry]; |
| 124 [BookmarkInteractionController registerBrowserStatePrefs:registry]; | 126 [BookmarkInteractionController registerBrowserStatePrefs:registry]; |
| 125 [BookmarkPromoController registerBrowserStatePrefs:registry]; | 127 [BookmarkPromoController registerBrowserStatePrefs:registry]; |
| 126 [HandoffManager registerBrowserStatePrefs:registry]; | 128 [HandoffManager registerBrowserStatePrefs:registry]; |
| 127 | 129 |
| 128 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); | 130 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); |
| 129 registry->RegisterBooleanPref( | 131 registry->RegisterBooleanPref( |
| 130 prefs::kEnableDoNotTrack, false, | 132 prefs::kEnableDoNotTrack, false, |
| 131 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 133 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 132 registry->RegisterBooleanPref( | 134 registry->RegisterBooleanPref( |
| 133 prefs::kEnableTranslate, true, | 135 prefs::kEnableTranslate, true, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 } | 168 } |
| 167 | 169 |
| 168 // This method should be periodically pruned of year+ old migrations. | 170 // This method should be periodically pruned of year+ old migrations. |
| 169 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { | 171 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { |
| 170 // Added 07/2014. | 172 // Added 07/2014. |
| 171 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); | 173 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); |
| 172 | 174 |
| 173 // Added 08/2015. | 175 // Added 08/2015. |
| 174 prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId); | 176 prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId); |
| 175 } | 177 } |
| OLD | NEW |