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

Unified Diff: ash/display/display_info.cc

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize 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 | « ash/display/display_info.h ('k') | ash/display/display_layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_info.cc
diff --git a/ash/display/display_info.cc b/ash/display/display_info.cc
index b0748039fd74d27cfdbebe6439132a67ab0ffb9a..b89d4d5d12a8eb524f9cdefe10098850a2722c60 100644
--- a/ash/display/display_info.cc
+++ b/ash/display/display_info.cc
@@ -25,9 +25,9 @@ namespace ash {
namespace {
// Use larger than max int to catch overflow early.
-const int64 kSynthesizedDisplayIdStart = 2200000000LL;
+const int64_t kSynthesizedDisplayIdStart = 2200000000LL;
-int64 synthesized_display_id = kSynthesizedDisplayIdStart;
+int64_t synthesized_display_id = kSynthesizedDisplayIdStart;
const float kDpi96 = 96.0;
bool use_125_dsf_for_ui_scaling = true;
@@ -112,7 +112,7 @@ DisplayInfo DisplayInfo::CreateFromSpec(const std::string& spec) {
// static
DisplayInfo DisplayInfo::CreateFromSpecWithID(const std::string& spec,
- int64 id) {
+ int64_t id) {
#if defined(OS_WIN)
gfx::Rect bounds_in_native(
gfx::Size(GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)));
@@ -247,7 +247,7 @@ DisplayInfo::DisplayInfo()
clear_overscan_insets_(false),
color_profile_(ui::COLOR_PROFILE_STANDARD) {}
-DisplayInfo::DisplayInfo(int64 id, const std::string& name, bool has_overscan)
+DisplayInfo::DisplayInfo(int64_t id, const std::string& name, bool has_overscan)
: id_(id),
name_(name),
has_overscan_(has_overscan),
« no previous file with comments | « ash/display/display_info.h ('k') | ash/display/display_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698