chrome/browser/extensions/app_sync_bundle.cc - Issue 217063005: Separate SyncData methods into three groups, local, remote, and common.

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/app_sync_bundle.cc

Issue 217063005: Separate SyncData methods into three groups, local, remote, and common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@syncapi

Patch Set: Rebase. 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/extensions/api/storage/settings_sync_unittest.cc ('k') | chrome/browser/extensions/extension_sync_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/app_sync_bundle.cc

diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc

index 061d5842fa04b1d883d0a7f0e02fffa197716732..e87bd14cbdd705042ba3d2df76052bd95713473c 100644

--- a/chrome/browser/extensions/app_sync_bundle.cc

+++ b/chrome/browser/extensions/app_sync_bundle.cc

@@ -11,6 +11,7 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

#include "sync/api/sync_change_processor.h"

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

#include "sync/api/sync_error_factory.h"

namespace extensions {

@@ -59,12 +60,13 @@ void AppSyncBundle::ProcessDeletion(std::string extension_id,

syncer::SyncChange AppSyncBundle::CreateSyncChange(

const syncer::SyncData& sync_data) {

- if (HasExtensionId(sync_data.GetTag())) {

+ const syncer::SyncDataLocal sync_data_local(sync_data);

+ if (HasExtensionId(sync_data_local.GetTag())) {

return syncer::SyncChange(FROM_HERE,

syncer::SyncChange::ACTION_UPDATE,

sync_data);

} else {

- AddApp(sync_data.GetTag());

+ AddApp(sync_data_local.GetTag());

return syncer::SyncChange(FROM_HERE,

syncer::SyncChange::ACTION_ADD,

sync_data);