chrome/browser/extensions/extension_sync_service.cc - Issue 195873020: [Sync] Move SyncPrefs into sync_driver component

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_sync_service.cc

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rerererebase 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/api/preferences_private/preferences_private_apitest.cc ('k') | chrome/browser/extensions/external_component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_sync_service.cc

diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc

index 87b6623d187a804fc8072a3ec6071f5711a96289..e5de8dbb8cdef703eb9f9b6e59027efe202e672b 100644

--- a/chrome/browser/extensions/extension_sync_service.cc

+++ b/chrome/browser/extensions/extension_sync_service.cc

@@ -19,8 +19,8 @@

#include "chrome/browser/extensions/launch_util.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/glue/sync_start_util.h"

-#include "chrome/browser/sync/sync_prefs.h"

#include "chrome/common/extensions/sync_helper.h"

+#include "components/sync_driver/sync_prefs.h"

#include "extensions/browser/app_sorting.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_registry.h"

@@ -44,16 +44,14 @@ ExtensionSyncService::ExtensionSyncService(Profile* profile,

extension_service_(extension_service),

app_sync_bundle_(this),

extension_sync_bundle_(this),

- pending_app_enables_(

- make_scoped_ptr(new browser_sync::SyncPrefs(

- extension_prefs_->pref_service())),

- &app_sync_bundle_,

- syncer::APPS),

- pending_extension_enables_(

- make_scoped_ptr(new browser_sync::SyncPrefs(

- extension_prefs_->pref_service())),

- &extension_sync_bundle_,

- syncer::EXTENSIONS),

+ pending_app_enables_(make_scoped_ptr(new sync_driver::SyncPrefs(

+ extension_prefs_->pref_service())),

+ &app_sync_bundle_,

+ syncer::APPS),

+ pending_extension_enables_(make_scoped_ptr(new sync_driver::SyncPrefs(

+ extension_prefs_->pref_service())),

+ &extension_sync_bundle_,

+ syncer::EXTENSIONS),

extesnion_gcm_app_handler_(new ExtensionGCMAppHandler(profile)) {

SetSyncStartFlare(sync_start_util::GetFlareForSyncableService(

profile_->GetPath()));