chrome/browser/sync/glue/session_model_associator.cc - Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace

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/glue/session_model_associator.cc

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync to head Created 8 years, 6 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/sync/glue/session_model_associator.cc

diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc

index a2cf336915716a2ed8a53f61a8134053c5f3dfa1..c6e4cbc9eee1df4eb505ee86674f1fb8f12a12d9 100644

--- a/chrome/browser/sync/glue/session_model_associator.cc

+++ b/chrome/browser/sync/glue/session_model_associator.cc

@@ -841,7 +841,8 @@ void SessionModelAssociator::InitializeCurrentMachineTag(

DVLOG(1) << "Restoring persisted session sync guid: "

<< persisted_guid;

} else {

- syncable::Directory* dir = trans->GetWrappedWriteTrans()->directory();

+ syncer::syncable::Directory* dir =

+ trans->GetWrappedWriteTrans()->directory();

current_machine_tag_ = "session_sync";

current_machine_tag_.append(dir->cache_guid());

DVLOG(1) << "Creating session sync guid: " << current_machine_tag_;