| 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 21 matching lines...) Expand all  Loading... | 
|   32 #include "components/variations/service/variations_service.h" |   32 #include "components/variations/service/variations_service.h" | 
|   33 #include "components/web_resource/web_resource_pref_names.h" |   33 #include "components/web_resource/web_resource_pref_names.h" | 
|   34 #include "ios/chrome/browser/browser_state/browser_state_info_cache.h" |   34 #include "ios/chrome/browser/browser_state/browser_state_info_cache.h" | 
|   35 #include "ios/chrome/browser/first_run/first_run.h" |   35 #include "ios/chrome/browser/first_run/first_run.h" | 
|   36 #import "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h" |   36 #import "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h" | 
|   37 #import "ios/chrome/browser/memory/memory_debugger_manager.h" |   37 #import "ios/chrome/browser/memory/memory_debugger_manager.h" | 
|   38 #import "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h" |   38 #import "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h" | 
|   39 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" |   39 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" | 
|   40 #include "ios/chrome/browser/notification_promo.h" |   40 #include "ios/chrome/browser/notification_promo.h" | 
|   41 #include "ios/chrome/browser/pref_names.h" |   41 #include "ios/chrome/browser/pref_names.h" | 
|   42 #include "ios/chrome/browser/pref_names.h" |   42 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h" | 
|   43 #include "ios/chrome/browser/signin/signin_manager_factory.h" |   43 #include "ios/chrome/browser/signin/signin_manager_factory.h" | 
|   44 #include "ios/chrome/browser/voice/voice_search_prefs_registration.h" |   44 #include "ios/chrome/browser/voice/voice_search_prefs_registration.h" | 
|   45 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" |   45 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" | 
|   46 #include "ui/base/l10n/l10n_util.h" |   46 #include "ui/base/l10n/l10n_util.h" | 
|   47  |   47  | 
|   48 void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { |   48 void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { | 
|   49   BrowserStateInfoCache::RegisterPrefs(registry); |   49   BrowserStateInfoCache::RegisterPrefs(registry); | 
|   50   flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry); |   50   flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry); | 
|   51   gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); |   51   gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); | 
|   52   ios::SigninManagerFactory::RegisterPrefs(registry); |   52   ios::SigninManagerFactory::RegisterPrefs(registry); | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   85   FirstRun::RegisterProfilePrefs(registry); |   85   FirstRun::RegisterProfilePrefs(registry); | 
|   86   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |   86   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 
|   87   HostContentSettingsMap::RegisterProfilePrefs(registry); |   87   HostContentSettingsMap::RegisterProfilePrefs(registry); | 
|   88   HttpServerPropertiesManagerFactory::RegisterProfilePrefs(registry); |   88   HttpServerPropertiesManagerFactory::RegisterProfilePrefs(registry); | 
|   89   ntp_snippets::NTPSnippetsService::RegisterProfilePrefs(registry); |   89   ntp_snippets::NTPSnippetsService::RegisterProfilePrefs(registry); | 
|   90   ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); |   90   ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); | 
|   91   ntp_tiles::PopularSites::RegisterProfilePrefs(registry); |   91   ntp_tiles::PopularSites::RegisterProfilePrefs(registry); | 
|   92   ios::NotificationPromo::RegisterProfilePrefs(registry); |   92   ios::NotificationPromo::RegisterProfilePrefs(registry); | 
|   93   password_manager::PasswordManager::RegisterProfilePrefs(registry); |   93   password_manager::PasswordManager::RegisterProfilePrefs(registry); | 
|   94   PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); |   94   PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); | 
 |   95   ReadingListModelFactory::RegisterProfilePrefs(registry); | 
|   95   syncer::SyncPrefs::RegisterProfilePrefs(registry); |   96   syncer::SyncPrefs::RegisterProfilePrefs(registry); | 
|   96   TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |   97   TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 
|   97   translate::TranslatePrefs::RegisterProfilePrefs(registry); |   98   translate::TranslatePrefs::RegisterProfilePrefs(registry); | 
|   98   variations::VariationsService::RegisterProfilePrefs(registry); |   99   variations::VariationsService::RegisterProfilePrefs(registry); | 
|   99   ZeroSuggestProvider::RegisterProfilePrefs(registry); |  100   ZeroSuggestProvider::RegisterProfilePrefs(registry); | 
|  100   RegisterVoiceSearchBrowserStatePrefs(registry); |  101   RegisterVoiceSearchBrowserStatePrefs(registry); | 
|  101  |  102  | 
|  102   registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); |  103   registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); | 
|  103   registry->RegisterBooleanPref( |  104   registry->RegisterBooleanPref( | 
|  104       prefs::kEnableDoNotTrack, false, |  105       prefs::kEnableDoNotTrack, false, | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  142 } |  143 } | 
|  143  |  144  | 
|  144 // This method should be periodically pruned of year+ old migrations. |  145 // This method should be periodically pruned of year+ old migrations. | 
|  145 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { |  146 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { | 
|  146   // Added 07/2014. |  147   // Added 07/2014. | 
|  147   translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); |  148   translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); | 
|  148  |  149  | 
|  149   // Added 08/2015. |  150   // Added 08/2015. | 
|  150   prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId); |  151   prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId); | 
|  151 } |  152 } | 
| OLD | NEW |