Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Unified Diff: chrome/browser/signin/easy_unlock_service_regular.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
Index: chrome/browser/signin/easy_unlock_service_regular.cc
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc
index a5b817a1bb08fa76bcecb9cc0f788afc4a3f91eb..8a290da9a06ad8389b63e1db44222760d2570b87 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/signin/easy_unlock_service_regular.h"
+#include <stdint.h>
+
#include "base/base64url.h"
#include "base/bind.h"
#include "base/command_line.h"
@@ -13,6 +15,7 @@
#include "base/sys_info.h"
#include "base/time/default_clock.h"
#include "base/values.h"
+#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
@@ -619,7 +622,8 @@ cryptauth::GcmDeviceInfo EasyUnlockServiceRegular::GetGcmDeviceInfo() {
ash::DisplayManager* display_manager =
ash::Shell::GetInstance()->display_manager();
- int64 primary_display_id = display_manager->GetPrimaryDisplayCandidate().id();
+ int64_t primary_display_id =
+ display_manager->GetPrimaryDisplayCandidate().id();
ash::DisplayInfo display_info =
display_manager->GetDisplayInfo(primary_display_id);
gfx::Rect bounds = display_info.bounds_in_native();
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_regular.h ('k') | chrome/browser/signin/easy_unlock_service_signin_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698