Switch to standard integer types in ui/gfx/.

ui/gfx/screen_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/screen.h"
 
 #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"
 
 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,
   // which is always at index 0.
   NSScreen* primary_screen = [[NSScreen screens] firstObject];
   float primary_screen_height = [primary_screen frame].size.height;
   gfx::Rect rect(NSRectToCGRect(ns_rect));
   rect.set_y(primary_screen_height - rect.y() - rect.height());
   return rect;
 }
@@ skipping 185 matching lines @@
     // CGDirectDisplayID is just an integer, so supporting up to this many
     // doesn't hurt.
     CGDirectDisplayID online_displays[128];
     CGDisplayCount online_display_count = 0;
     if (CGGetOnlineDisplayList(arraysize(online_displays),
                               online_displays,
                               &online_display_count) != kCGErrorSuccess) {
       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;
     }
 
     std::vector<gfx::Display> displays;
     for (CGDisplayCount online_display_index = 0;
         online_display_index < online_display_count;
         ++online_display_index) {
       CGDirectDisplayID online_display = online_displays[online_display_index];
       if (CGDisplayMirrorsDisplay(online_display) == kCGNullDirectDisplay) {
         // If this display doesn't mirror any other, include it in the list.
@@ skipping 29 matching lines @@
 
 namespace gfx {
 
 #if !defined(USE_AURA)
 Screen* CreateNativeScreen() {
   return new ScreenMac;
 }
 #endif
 
 }