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

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/conflict_resolver.h ('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 3a9e67328c367629e01fb2805005f53630a9d9bf..91c9c4805273873b919eb8ceaaf62b57ef3ed155 100644

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

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

@@ -4,6 +4,8 @@

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

+#include <stdint.h>

#include "base/callback.h"

#include "base/format_macros.h"

#include "base/location.h"

@@ -96,7 +98,7 @@ void ConflictResolver::RunExclusive(scoped_ptr<SyncTaskToken> token) {

if (metadata_database()->GetConflictingTrackers(&trackers)) {

target_file_id_ = PickPrimaryFile(trackers);

DCHECK(!target_file_id_.empty());

- int64 primary_tracker_id = -1;

+ int64_t primary_tracker_id = -1;

for (TrackerIDSet::const_iterator itr = trackers.begin();

itr != trackers.end(); ++itr) {

FileTracker tracker;