chrome/browser/sync/glue/session_model_associator.cc - Issue 10147003: [Sync] Move 'syncapi_core' and 'sync_unit_tests' targets to sync/

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 10147003: [Sync] Move 'syncapi_core' and 'sync_unit_tests' targets to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Win update errors Created 8 years, 8 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 bf5db1b945791f3641ece7f63a4861699451f7c8..ed3b66451c184d98a19d498c83057faedf7693ad 100644

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

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

@@ -21,10 +21,6 @@

#include "chrome/browser/sync/glue/synced_session.h"

#include "chrome/browser/sync/glue/synced_tab_delegate.h"

#include "chrome/browser/sync/glue/synced_window_delegate.h"

-#include "chrome/browser/sync/internal_api/read_node.h"

-#include "chrome/browser/sync/internal_api/read_transaction.h"

-#include "chrome/browser/sync/internal_api/write_node.h"

-#include "chrome/browser/sync/internal_api/write_transaction.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

@@ -33,10 +29,14 @@

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_service.h"

+#include "sync/internal_api/read_node.h"

+#include "sync/internal_api/read_transaction.h"

+#include "sync/internal_api/write_node.h"

+#include "sync/internal_api/write_transaction.h"

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

-#include "sync/syncable/syncable.h"

#include "sync/syncable/model_type.h"

#include "sync/syncable/model_type_payload_map.h"

+#include "sync/syncable/syncable.h"

#include "sync/util/get_session_name.h"

#if defined(OS_LINUX)

#include "base/linux_util.h"