chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 1190203002: Move (most of) chrome/browser/drive into components/drive/service.

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 1190203002: Move (most of) chrome/browser/drive into components/drive/service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing... Created 5 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

« no previous file with comments | « chrome/browser/sync_file_system/DEPS ('k') | chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 59ebf2963ab795f583cdbcb51b8d8ff36f2050d1..3a9e67328c367629e01fb2805005f53630a9d9bf 100644

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

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

@@ -9,9 +9,6 @@

#include "base/location.h"

#include "base/logging.h"

#include "base/strings/stringprintf.h"

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

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

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

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

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

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

@@ -19,6 +16,9 @@

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

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

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

+#include "components/drive/drive_api_util.h"

+#include "components/drive/drive_uploader.h"

+#include "components/drive/service/drive_service_interface.h"

#include "google_apis/drive/drive_api_parser.h"

namespace sync_file_system {