chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc - Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/.

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/chromeos/login/signin/merge_session_throttling_utils.cc

Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (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:

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

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc

diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc

index 4ee5d6239ad344e80ad3c61812408b725c9f5c93..68a74d75878820ea24f9e7c6a18e6394c07ca7af 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc

@@ -4,8 +4,11 @@

#include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h"

+#include <stdint.h>

#include "base/lazy_instance.h"

#include "base/logging.h"

+#include "base/macros.h"

#include "base/memory/singleton.h"

#include "base/threading/non_thread_safe.h"

#include "base/time/time.h"

@@ -26,7 +29,7 @@ namespace merge_session_throttling_utils {

namespace {

-const int64 kMaxSessionRestoreTimeInSec = 60;

+const int64_t kMaxSessionRestoreTimeInSec = 60;

// The set of blocked profiles.

class ProfileSet : public base::NonThreadSafe, public std::set<Profile*> {