chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 125733003: [SyncFS] Clean up V1 drive_file_sync_util.h dependency from V2

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 125733003: [SyncFS] Clean up V1 drive_file_sync_util.h dependency from V2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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 6d26bab4cf8871376c453c470e50a71da919ae2e..f2ed33a616f85b682addd6c607654c6e3e303168 100644

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

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

@@ -16,7 +16,6 @@

#include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"

#include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"

#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"

-#include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h"

#include "chrome/browser/sync_file_system/logger.h"

#include "google_apis/drive/drive_api_parser.h"