ios/chrome/browser/prefs/browser_prefs.mm - Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver.

Side by Side Diff: ios/chrome/browser/prefs/browser_prefs.mm

Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a

Patch Set: Full change rebased on static lib. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « ios/chrome/browser/passwords/password_controller.mm ('k') | ios/chrome/browser/sync/fake_sync_service_factory.cc » ('j') | no next file with comments »

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"

11 #include "components/flags_ui/pref_service_flags_storage.h"	11 #include "components/flags_ui/pref_service_flags_storage.h"

12 #include "components/gcm_driver/gcm_channel_status_syncer.h"	12 #include "components/gcm_driver/gcm_channel_status_syncer.h"

13 #include "components/network_time/network_time_tracker.h"	13 #include "components/network_time/network_time_tracker.h"

14 #include "components/ntp_snippets/ntp_snippets_service.h"	14 #include "components/ntp_snippets/ntp_snippets_service.h"

15 #include "components/omnibox/browser/zero_suggest_provider.h"	15 #include "components/omnibox/browser/zero_suggest_provider.h"

16 #include "components/password_manager/core/browser/password_manager.h"	16 #include "components/password_manager/core/browser/password_manager.h"

17 #include "components/pref_registry/pref_registry_syncable.h"	17 #include "components/pref_registry/pref_registry_syncable.h"

18 #include "components/prefs/pref_service.h"	18 #include "components/prefs/pref_service.h"

19 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"	19 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"

20 #include "components/rappor/rappor_service.h"	20 #include "components/rappor/rappor_service.h"

21 #include "components/search_engines/template_url_prepopulate_data.h"	21 #include "components/search_engines/template_url_prepopulate_data.h"

22 #include "components/signin/core/common/signin_pref_names.h"	22 #include "components/signin/core/common/signin_pref_names.h"

23 #include "components/ssl_config/ssl_config_service_manager.h"	23 #include "components/ssl_config/ssl_config_service_manager.h"

24 #include "components/strings/grit/components_locale_settings.h"	24 #include "components/strings/grit/components_locale_settings.h"

25 #include "components/sync_driver/sync_prefs.h"	25 #include "components/sync/driver/sync_prefs.h"

26 #include "components/translate/core/browser/translate_prefs.h"	26 #include "components/translate/core/browser/translate_prefs.h"

27 #include "components/translate/core/common/translate_pref_names.h"	27 #include "components/translate/core/common/translate_pref_names.h"

28 #include "components/update_client/update_client.h"	28 #include "components/update_client/update_client.h"

29 #include "components/variations/service/variations_service.h"	29 #include "components/variations/service/variations_service.h"

30 #include "components/web_resource/promo_resource_service.h"	30 #include "components/web_resource/promo_resource_service.h"

31 #include "ios/chrome/browser/application_context_impl.h"	31 #include "ios/chrome/browser/application_context_impl.h"

32 #include "ios/chrome/browser/browser_state/browser_state_info_cache.h"	32 #include "ios/chrome/browser/browser_state/browser_state_info_cache.h"

33 #include "ios/chrome/browser/first_run/first_run.h"	33 #include "ios/chrome/browser/first_run/first_run.h"

34 #import "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h"	34 #import "ios/chrome/browser/geolocation/omnibox_geolocation_local_state.h"

35 #import "ios/chrome/browser/memory/memory_debugger_manager.h"	35 #import "ios/chrome/browser/memory/memory_debugger_manager.h"

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
153 }	153 }

154	154

155 // This method should be periodically pruned of year+ old migrations.	155 // This method should be periodically pruned of year+ old migrations.

156 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {	156 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {

157 // Added 07/2014.	157 // Added 07/2014.

158 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);	158 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);

159	159

160 // Added 08/2015.	160 // Added 08/2015.

161 prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId);	161 prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId);

162 }	162 }

OLD	NEW