chrome/browser/sync_file_system/drive_backend/conflict_resolver.h - Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4.

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 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h ('k') | chrome/browser/sync_file_system/drive_backend/conflict_resolver.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.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 e0cfef747befef3c3fe960cb02972f9ef7cead3f..ae2e1f5f0033874c8942db7800ae2ef7d547e2fd 100644

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

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

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

#include <utility>

#include <vector>

+#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

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