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

Unified Diff: ash/display/display_util.h

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_manager_unittest.cc ('k') | ash/display/display_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_util.h
diff --git a/ash/display/display_util.h b/ash/display/display_util.h
index 0e4dadf97d0cc0e39277c88ec0b71e1485295778..ccaa8dff74db01aa33b6e708f793fd735ba20cbc 100644
--- a/ash/display/display_util.h
+++ b/ash/display/display_util.h
@@ -5,6 +5,8 @@
#ifndef ASH_DISPLAY_DISPLAY_UTIL_H_
#define ASH_DISPLAY_DISPLAY_UTIL_H_
+#include <stdint.h>
+
#include <set>
#include <utility>
#include <vector>
@@ -55,7 +57,7 @@ ASH_EXPORT bool GetDisplayModeForNextResolution(const DisplayInfo& info,
// Sets the UI scale for the |display_id|. Returns false if the
// display_id is not an internal display.
-ASH_EXPORT bool SetDisplayUIScale(int64 display_id, float scale);
+ASH_EXPORT bool SetDisplayUIScale(int64_t display_id, float scale);
// Tests if the |info| has display mode that matches |ui_scale|.
bool HasDisplayModeForUIScale(const DisplayInfo& info, float ui_scale);
@@ -89,12 +91,12 @@ ASH_EXPORT int FindDisplayIndexContainingPoint(
// Creates the DisplayIdPair where ids are sorted using |CompareDisplayIds|
// below.
-ASH_EXPORT DisplayIdPair CreateDisplayIdPair(int64 id1, int64 id2);
+ASH_EXPORT DisplayIdPair CreateDisplayIdPair(int64_t id1, int64_t id2);
// Returns true if one of following conditinos is met.
// 1) id1 is internal.
// 2) output index of id1 < output index of id2 and id2 isn't internal.
-ASH_EXPORT bool CompareDisplayIds(int64 id1, int64 id2);
+ASH_EXPORT bool CompareDisplayIds(int64_t id1, int64_t id2);
} // namespace ash
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/display_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698