chrome/browser/sync_file_system/local/local_file_sync_status.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/local/local_file_sync_status.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/local/local_file_sync_service_unittest.cc ('k') | chrome/browser/sync_file_system/local/local_file_sync_status_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/local/local_file_sync_status.h

diff --git a/chrome/browser/sync_file_system/local/local_file_sync_status.h b/chrome/browser/sync_file_system/local/local_file_sync_status.h

index 1556d97eab13766c880924771838cc2033d433b6..acd27e196599e26d2344accb4303f4f96aa12c78 100644

--- a/chrome/browser/sync_file_system/local/local_file_sync_status.h

+++ b/chrome/browser/sync_file_system/local/local_file_sync_status.h

@@ -5,12 +5,14 @@

#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_LOCAL_LOCAL_FILE_SYNC_STATUS_H_

#define CHROME_BROWSER_SYNC_FILE_SYSTEM_LOCAL_LOCAL_FILE_SYNC_STATUS_H_

+#include <stdint.h>

#include <map>

#include <set>

-#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/gtest_prod_util.h"

+#include "base/macros.h"

#include "base/observer_list.h"

#include "base/threading/non_thread_safe.h"

#include "storage/browser/fileapi/file_system_url.h"

@@ -83,7 +85,7 @@ class LocalFileSyncStatus

typedef std::set<base::FilePath> PathSet;

typedef std::map<OriginAndType, PathSet> URLSet;

- typedef std::map<base::FilePath, int64> PathBucket;

+ typedef std::map<base::FilePath, int64_t> PathBucket;

typedef std::map<OriginAndType, PathBucket> URLBucket;

bool IsChildOrParentWriting(const storage::FileSystemURL& url) const;