chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc - Issue 2130453004: [Sync] Move //sync to //components/sync.

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/supervised_user/legacy/supervised_user_sync_service.cc

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 5 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/supervised_user/legacy/supervised_user_sync_service.h ('k') | chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc

diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc

index 630b163238cf8b8ad0e30ee6f331a0d84e0c7faa..ce9d8749ea6a81b814358731c00bab875106df30 100644

--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc

+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"

#include <stddef.h>

#include <set>

#include <utility>

@@ -21,12 +22,12 @@

#include "components/pref_registry/pref_registry_syncable.h"

#include "components/prefs/scoped_user_pref_update.h"

#include "components/signin/core/browser/signin_manager.h"

-#include "sync/api/sync_change.h"

-#include "sync/api/sync_data.h"

-#include "sync/api/sync_error.h"

-#include "sync/api/sync_error_factory.h"

-#include "sync/api/sync_merge_result.h"

-#include "sync/protocol/sync.pb.h"

+#include "components/sync/api/sync_change.h"

+#include "components/sync/api/sync_data.h"

+#include "components/sync/api/sync_error.h"

+#include "components/sync/api/sync_error_factory.h"

+#include "components/sync/api/sync_merge_result.h"

+#include "components/sync/protocol/sync.pb.h"

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/login/users/default_user_image/default_user_images.h"