chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc - Issue 2401223002: [Sync] Renaming sync/api* to sync/model*.

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_shared_settings_service.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)

Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 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_shared_settings_service.h ('k') | chrome/browser/supervised_user/legacy/supervised_user_shared_settings_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_shared_settings_service.cc

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

index 56faebb9af3d0f2fa36a76833ed8a4305a1b6c1e..23df62a3ac1f9b82ec8210d6e2e9fa65c75dddfc 100644

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

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

@@ -15,11 +15,11 @@

#include "components/pref_registry/pref_registry_syncable.h"

#include "components/prefs/pref_service.h"

#include "components/prefs/scoped_user_pref_update.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/model/sync_change.h"

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

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

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

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

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

using base::DictionaryValue;