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

Index: chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

index de43a4cf0e2ab21df91bd290087b4d35546a74a2..c85fc04c223284218244a2f37fb34c8461cf8aa4 100644

--- a/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

+++ b/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

@@ -7,8 +7,8 @@

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

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

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

#include "chrome/common/extensions/api/preferences_private.h"

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

namespace extensions {

@@ -46,7 +46,7 @@ bool PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction::RunImpl() {

syncer::ModelTypeSet result_set = syncer::UserSelectableTypes();

// Only include categories that are synced.

- browser_sync::SyncPrefs sync_prefs(GetProfile()->GetPrefs());

+ sync_driver::SyncPrefs sync_prefs(GetProfile()->GetPrefs());

if (!sync_prefs.HasKeepEverythingSynced()) {

result_set = syncer::Intersection(result_set,

sync_service->GetPreferredDataTypes());