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

Unified Diff: ios/chrome/browser/prefs/browser_prefs.mm

Issue 2591823003: Remove ChromeBrowserProvider::RegisterProfilePrefs(). (Closed)
Patch Set: Fix multiple registration of preferences. Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/prefs/BUILD.gn ('k') | ios/chrome/browser/ui/bookmarks/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/prefs/browser_prefs.mm
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index 80cab2eb92a188a74aaaad058394f88714c7901d..b4ff74097a5adbcf357b2bb1441483d27499d30d 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -10,6 +10,7 @@
#include "components/dom_distiller/core/distilled_page_prefs.h"
#include "components/flags_ui/pref_service_flags_storage.h"
#include "components/gcm_driver/gcm_channel_status_syncer.h"
+#import "components/handoff/handoff_manager.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/network_time/network_time_tracker.h"
#include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h"
@@ -43,6 +44,8 @@
#include "ios/chrome/browser/physical_web/physical_web_prefs_registration.h"
#include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/signin/signin_manager_factory.h"
+#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h"
+#import "ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h"
#include "ios/chrome/browser/voice/voice_search_prefs_registration.h"
#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#include "ui/base/l10n/l10n_util.h"
@@ -104,6 +107,10 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
ZeroSuggestProvider::RegisterProfilePrefs(registry);
RegisterVoiceSearchBrowserStatePrefs(registry);
+ [BookmarkInteractionController registerBrowserStatePrefs:registry];
+ [BookmarkPromoController registerBrowserStatePrefs:registry];
+ [HandoffManager registerBrowserStatePrefs:registry];
+
registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false);
registry->RegisterBooleanPref(
prefs::kEnableDoNotTrack, false,
@@ -138,8 +145,6 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Register prefs used by Clear Browsing Data UI.
browsing_data::prefs::RegisterBrowserUserPrefs(registry);
-
- ios::GetChromeBrowserProvider()->RegisterProfilePrefs(registry);
}
// This method should be periodically pruned of year+ old migrations.
« no previous file with comments | « ios/chrome/browser/prefs/BUILD.gn ('k') | ios/chrome/browser/ui/bookmarks/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698