chrome/browser/supervised_user/supervised_user_settings_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/supervised_user_settings_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:

Index: chrome/browser/supervised_user/supervised_user_settings_service.cc

diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc

index b7ee4dc2c1a245acc111235bb335a0fcdc663dfd..6628c217b971eae0cc53a31dfcc1dc00efbd5a72 100644

--- a/chrome/browser/supervised_user/supervised_user_settings_service.cc

+++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc

@@ -18,11 +18,11 @@

#include "chrome/common/chrome_constants.h"

#include "components/prefs/json_pref_store.h"

#include "components/prefs/pref_filter.h"

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

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

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

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/user_metrics.h"

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

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

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

using base::DictionaryValue;

using base::JSONReader;