chrome/browser/sync_file_system/drive_backend/conflict_resolver.h - 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.h

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.h

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

index 5daadf84062f393e38fe0b7bdb6c7129ed43d9ab..70c23c1ef58653958ed3f3605c3ee0487b47005f 100644

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

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

@@ -10,9 +10,9 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

-#include "chrome/browser/google_apis/gdata_errorcode.h"

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

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

+#include "google_apis/drive/gdata_errorcode.h"

namespace drive {

class DriveServiceInterface;