sync/engine/conflict_resolver.h - Issue 1545553003: Switch to standard integer types in sync/.

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: sync/engine/conflict_resolver.h

Issue 1545553003: Switch to standard integer types in sync/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

Index: sync/engine/conflict_resolver.h

diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h

index 3266afb2a958c510e52e20c5bf7b17b1e3bea10b..b4df5991278f1ed8c5ca157accbbd5fd67d89a7d 100644

--- a/sync/engine/conflict_resolver.h

+++ b/sync/engine/conflict_resolver.h

@@ -10,8 +10,8 @@

#include <set>

-#include "base/basictypes.h"

#include "base/gtest_prod_util.h"

+#include "base/macros.h"

#include "sync/engine/syncer_types.h"

namespace syncer {

« no previous file with comments | « sync/engine/commit_util.cc ('k') | sync/engine/directory_commit_contribution.h » ('j') | no next file with comments »