chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 96413002: Move c/b/google_apis to google_apis/drive.

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 96413002: Move c/b/google_apis to google_apis/drive. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years 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 29df92525d0c9581dada7c727acbbc25f873a030..00e90e64842df6cb92e2dd172e3bafa14a5ed2b7 100644

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

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

@@ -10,12 +10,12 @@

#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/google_apis/drive_api_parser.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"

#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 "google_apis/drive/drive_api_parser.h"

namespace sync_file_system {

namespace drive_backend {