chrome/browser/sync/sessions2/sessions_sync_manager.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/sync/sessions2/sessions_sync_manager.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: Remove AsLocal and AsRemote methods from SyncData. 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/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/sessions2/sessions_sync_manager_unittest.cc » ('j') | sync/api/sync_change.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sessions2/sessions_sync_manager.cc

diff --git a/chrome/browser/sync/sessions2/sessions_sync_manager.cc b/chrome/browser/sync/sessions2/sessions_sync_manager.cc

index 58be18634e106606c67f5347d09279471f31d3b4..dcb5fd3c55895c4e335dc4ce662fd61acfb485e5 100644

--- a/chrome/browser/sync/sessions2/sessions_sync_manager.cc

+++ b/chrome/browser/sync/sessions2/sessions_sync_manager.cc

@@ -488,7 +488,7 @@ syncer::SyncError SessionsSyncManager::ProcessSyncChanges(

return syncer::SyncError();

}

UpdateTrackerWithForeignSession(

- session, it->sync_data().GetRemoteModifiedTime());

+ session, syncer::SyncDataRemote(it->sync_data()).GetModifiedTime());

break;

default:

NOTREACHED() << "Processing sync changes failed, unknown change type.";

@@ -541,7 +541,8 @@ bool SessionsSyncManager::InitFromSyncModel(

if (tombstone.IsValid())

new_changes->push_back(tombstone);

} else if (specifics.session_tag() != current_machine_tag()) {

- UpdateTrackerWithForeignSession(specifics, data.GetRemoteModifiedTime());

+ UpdateTrackerWithForeignSession(

+ specifics, syncer::SyncDataRemote(data).GetModifiedTime());

} else {

// This is previously stored local session information.

if (specifics.has_header() && !found_current_header) {