components/history/core/browser/typed_url_syncable_service.h - Issue 1548113002: Switch to standard integer types in components/, part 2 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: components/history/core/browser/typed_url_syncable_service.h

Issue 1548113002: Switch to standard integer types in components/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gn 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 | « components/history/core/browser/top_sites_impl_unittest.cc ('k') | components/history/core/browser/typed_url_syncable_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/history/core/browser/typed_url_syncable_service.h

diff --git a/components/history/core/browser/typed_url_syncable_service.h b/components/history/core/browser/typed_url_syncable_service.h

index da396dc6bd9f3ffd4b504515e0ce9f42d04f49b7..db1f575c0c7cf01aa2efb933bc9653b351fea647 100644

--- a/components/history/core/browser/typed_url_syncable_service.h

+++ b/components/history/core/browser/typed_url_syncable_service.h

@@ -5,9 +5,12 @@

#ifndef COMPONENTS_HISTORY_CORE_BROWSER_TYPED_URL_SYNCABLE_SERVICE_H_

#define COMPONENTS_HISTORY_CORE_BROWSER_TYPED_URL_SYNCABLE_SERVICE_H_

+#include <stdint.h>

#include <set>

#include <vector>

+#include "base/macros.h"

#include "base/scoped_observer.h"

#include "base/threading/thread_checker.h"

#include "components/history/core/browser/history_backend_observer.h"

@@ -95,7 +98,7 @@ class TypedUrlSyncableService : public syncer::SyncableService,

typedef std::map<GURL, VisitVector> UrlVisitVectorMap;

// Bitfield returned from MergeUrls to specify the result of a merge.

- typedef uint32 MergeResult;

+ typedef uint32_t MergeResult;

static const MergeResult DIFF_NONE = 0;

static const MergeResult DIFF_UPDATE_NODE = 1 << 0;

static const MergeResult DIFF_LOCAL_ROW_CHANGED = 1 << 1;