chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 213473008: [SyncFS] Split SyncEngine and SyncEngineContext

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_file_system/drive_backend/conflict_resolver.cc

Issue 213473008: [SyncFS] Split SyncEngine and SyncEngineContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests 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:

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

index 726520f7bef0f33a43775de8019f6cd84cec816c..b3043baac975a1aeff2bdfa95400f446142969fd 100644

--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

@@ -8,6 +8,7 @@

#include "base/format_macros.h"

#include "base/location.h"

#include "base/logging.h"

+#include "base/sequenced_task_runner.h"

tzik 2014/03/27 11:24:17 I think all #include additions are not needed.

peria 2014/03/28 03:20:23 Done.

#include "chrome/browser/drive/drive_api_util.h"

#include "chrome/browser/drive/drive_service_interface.h"

#include "chrome/browser/drive/drive_uploader.h"