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

Unified Diff: ui/gfx/screen_mac.mm

Issue 1543183002: Switch to standard integer types in ui/gfx/. (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 | « ui/gfx/screen_android.cc ('k') | ui/gfx/screen_type_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/screen_mac.mm
diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm
index e23feedebbfc76b31b3c326ae620924e0367eaa5..6fb7c6e8dc284f597a9f5cac0b9966d085968b97 100644
--- a/ui/gfx/screen_mac.mm
+++ b/ui/gfx/screen_mac.mm
@@ -6,11 +6,13 @@
#import <ApplicationServices/ApplicationServices.h>
#import <Cocoa/Cocoa.h>
+#include <stdint.h>
#include <map>
#include "base/logging.h"
#include "base/mac/sdk_forward_declarations.h"
+#include "base/macros.h"
#include "base/timer/timer.h"
#include "ui/gfx/display.h"
#include "ui/gfx/display_change_notifier.h"
@@ -19,7 +21,7 @@ namespace {
// The delay to handle the display configuration changes.
// See comments in ScreenMac::HandleDisplayReconfiguration.
-const int64 kConfigureDelayMs = 500;
+const int64_t kConfigureDelayMs = 500;
gfx::Rect ConvertCoordinateSystem(NSRect ns_rect) {
// Primary monitor is defined as the monitor with the menubar,
@@ -225,12 +227,12 @@ class ScreenMac : public gfx::Screen {
return std::vector<gfx::Display>(1, GetPrimaryDisplay());
}
- typedef std::map<int64, NSScreen*> ScreenIdsToScreensMap;
+ typedef std::map<int64_t, NSScreen*> ScreenIdsToScreensMap;
ScreenIdsToScreensMap screen_ids_to_screens;
for (NSScreen* screen in [NSScreen screens]) {
NSDictionary* screen_device_description = [screen deviceDescription];
- int64 screen_id = [[screen_device_description
- objectForKey:@"NSScreenNumber"] unsignedIntValue];
+ int64_t screen_id = [[screen_device_description
+ objectForKey:@"NSScreenNumber"] unsignedIntValue];
screen_ids_to_screens[screen_id] = screen;
}
« no previous file with comments | « ui/gfx/screen_android.cc ('k') | ui/gfx/screen_type_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698