components/syncable_prefs/pref_model_associator.cc - Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT]

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: components/syncable_prefs/pref_model_associator.cc

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1

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

Index: components/syncable_prefs/pref_model_associator.cc

diff --git a/components/syncable_prefs/pref_model_associator.cc b/components/syncable_prefs/pref_model_associator.cc

index dd9d71494251ac0ed3fc456a9a1fd2f213a98f31..ef63b1c4cb503b5d6adbe459fc48fa4d597e989f 100644

--- a/components/syncable_prefs/pref_model_associator.cc

+++ b/components/syncable_prefs/pref_model_associator.cc

@@ -16,12 +16,12 @@

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

#include "components/prefs/pref_service.h"

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

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

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

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

#include "components/syncable_prefs/pref_model_associator_client.h"

#include "components/syncable_prefs/pref_service_syncable.h"

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

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

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

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

using syncer::PREFERENCES;

using syncer::PRIORITY_PREFERENCES;

« build/all.gyp ('K') | « components/syncable_prefs/pref_model_associator.h ('k') | components/syncable_prefs/pref_service_syncable_unittest.cc » ('j') | no next file with comments »