Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

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

Issue 2511883007: Revert of [ObjC ARC] Converts ios/chrome/browser/prefs:prefs to ARC.Automatically generated ARC... (Closed)
Patch Set: Created 4 years, 1 month 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/prefs/BUILD.gn ('k') | ios/chrome/browser/prefs/pref_observer_bridge.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 #import "ios/chrome/browser/memory/memory_debugger_manager.h" 39 #import "ios/chrome/browser/memory/memory_debugger_manager.h"
40 #import "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h" 40 #import "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h"
41 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" 41 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h"
42 #include "ios/chrome/browser/notification_promo.h" 42 #include "ios/chrome/browser/notification_promo.h"
43 #include "ios/chrome/browser/pref_names.h" 43 #include "ios/chrome/browser/pref_names.h"
44 #include "ios/chrome/browser/signin/signin_manager_factory.h" 44 #include "ios/chrome/browser/signin/signin_manager_factory.h"
45 #include "ios/chrome/browser/voice/voice_search_prefs_registration.h" 45 #include "ios/chrome/browser/voice/voice_search_prefs_registration.h"
46 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" 46 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
47 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
48 48
49 #if !defined(__has_feature) || !__has_feature(objc_arc)
50 #error "This file requires ARC support."
51 #endif
52
53 void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { 49 void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
54 BrowserStateInfoCache::RegisterPrefs(registry); 50 BrowserStateInfoCache::RegisterPrefs(registry);
55 flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry); 51 flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry);
56 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); 52 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
57 ios::SigninManagerFactory::RegisterPrefs(registry); 53 ios::SigninManagerFactory::RegisterPrefs(registry);
58 IOSChromeMetricsServiceClient::RegisterPrefs(registry); 54 IOSChromeMetricsServiceClient::RegisterPrefs(registry);
59 network_time::NetworkTimeTracker::RegisterPrefs(registry); 55 network_time::NetworkTimeTracker::RegisterPrefs(registry);
60 ios::NotificationPromo::RegisterPrefs(registry); 56 ios::NotificationPromo::RegisterPrefs(registry);
61 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); 57 PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
62 rappor::RapporService::RegisterPrefs(registry); 58 rappor::RapporService::RegisterPrefs(registry);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } 145 }
150 146
151 // This method should be periodically pruned of year+ old migrations. 147 // This method should be periodically pruned of year+ old migrations.
152 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) { 148 void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {
153 // Added 07/2014. 149 // Added 07/2014.
154 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); 150 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);
155 151
156 // Added 08/2015. 152 // Added 08/2015.
157 prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId); 153 prefs->ClearPref(::prefs::kSigninSharedAuthenticationUserId);
158 } 154 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/prefs/BUILD.gn ('k') | ios/chrome/browser/prefs/pref_observer_bridge.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698