components/sync_sessions/sessions_sync_manager.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/sync_sessions/sessions_sync_manager.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/sync_sessions/sessions_sync_manager.cc

diff --git a/components/sync_sessions/sessions_sync_manager.cc b/components/sync_sessions/sessions_sync_manager.cc

index a678c44f567745edea506ac9d8de14f256418f0a..4d9505d1eae379753763086a22a70d3f097dd401 100644

--- a/components/sync_sessions/sessions_sync_manager.cc

+++ b/components/sync_sessions/sessions_sync_manager.cc

@@ -10,17 +10,17 @@

#include "base/metrics/field_trial.h"

#include "base/metrics/histogram_macros.h"

#include "build/build_config.h"

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

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

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

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

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

#include "components/sync_driver/local_device_info_provider.h"

#include "components/sync_sessions/sync_sessions_client.h"

#include "components/sync_sessions/synced_tab_delegate.h"

#include "components/sync_sessions/synced_window_delegate.h"

#include "components/sync_sessions/synced_window_delegates_getter.h"

#include "components/variations/variations_associated_data.h"

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

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

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

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

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

using sessions::SerializedNavigationEntry;

using sync_driver::DeviceInfo;

« build/all.gyp ('K') | « components/sync_sessions/sessions_sync_manager.h ('k') | components/sync_sessions/synced_session.h » ('j') | no next file with comments »