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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/pending_enables.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index d100644d07eca684f747fc17704cd4f8f95e6efb..19d3ba65dedf851d97de3114fd564b426cbaaf13 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -70,7 +70,6 @@
#include "chrome/browser/services/gcm/gcm_profile_service.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/signin_promo.h"
-#include "chrome/browser/sync/sync_prefs.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/ui/app_list/app_list_service.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
@@ -94,6 +93,7 @@
#include "components/autofill/core/browser/autofill_manager.h"
#include "components/password_manager/core/browser/password_manager.h"
#include "components/rappor/rappor_service.h"
+#include "components/sync_driver/sync_prefs.h"
#include "components/translate/core/browser/translate_prefs.h"
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/render_process_host.h"
@@ -339,7 +339,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
autofill::AutofillManager::RegisterProfilePrefs(registry);
BookmarkPromptPrefs::RegisterProfilePrefs(registry);
bookmark_utils::RegisterProfilePrefs(registry);
- browser_sync::SyncPrefs::RegisterProfilePrefs(registry);
+ sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
ChromeContentBrowserClient::RegisterProfilePrefs(registry);
ChromeVersionService::RegisterProfilePrefs(registry);
chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
« no previous file with comments | « chrome/browser/extensions/pending_enables.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698