Switch to standard integer types in ui/gfx/.

ui/gfx/display.h

 // 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.
 
 #ifndef UI_GFX_DISPLAY_H_
 #define UI_GFX_DISPLAY_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
 // This class typically, but does not always, correspond to a physical display
 // connected to the system. A fake Display may exist on a headless system, or a
 // Display may correspond to a remote, virtual display.
 //
@@ skipping 25 matching lines @@
     ROTATION_SOURCE_USER,
   };
 
   // Touch support for the display.
   enum TouchSupport {
     TOUCH_SUPPORT_UNKNOWN,
     TOUCH_SUPPORT_AVAILABLE,
     TOUCH_SUPPORT_UNAVAILABLE,
   };
 
-  enum : int64 { kInvalidDisplayID = -1 };
+  enum : int64_t { kInvalidDisplayID = -1 };
 
   // Creates a display with kInvalidDisplayID as default.
   Display();
-  explicit Display(int64 id);
-  Display(int64 id, const Rect& bounds);
+  explicit Display(int64_t id);
+  Display(int64_t id, const Rect& bounds);
   ~Display();
 
   // Returns the forced device scale factor, which is given by
   // "--force-device-scale-factor".
   static float GetForcedDeviceScaleFactor();
 
   // Indicates if a device scale factor is being explicitly enforced from the
   // command line via "--force-device-scale-factor".
   static bool HasForceDeviceScaleFactor();
 
   // Resets the caches used to determine if a device scale factor is being
   // forced from the command line via "--force-device-scale-factor", and thus
   // ensures that the command line is reevaluated.
   static void ResetForceDeviceScaleFactorForTesting();
 
   // Sets/Gets unique identifier associated with the display.
   // -1 means invalid display and it doesn't not exit.
-  int64 id() const { return id_; }
-  void set_id(int64 id) { id_ = id; }
+  int64_t id() const { return id_; }
+  void set_id(int64_t id) { id_ = id; }
 
   // Gets/Sets the display's bounds in gfx::Screen's coordinates.
   const Rect& bounds() const { return bounds_; }
   void set_bounds(const Rect& bounds) { bounds_ = bounds; }
 
   // Gets/Sets the display's work area in gfx::Screen's coordinates.
   const Rect& work_area() const { return work_area_; }
   void set_work_area(const Rect& work_area) { work_area_ = work_area; }
 
   // Output device's pixel scale factor. This specifies how much the
@@ skipping 39 matching lines @@
   // Returns a string representation of the display;
   std::string ToString() const;
 
   // True if the display contains valid display id.
   bool is_valid() const { return id_ != kInvalidDisplayID; }
 
   // True if the display corresponds to internal panel.
   bool IsInternal() const;
 
   // Gets/Sets an id of display corresponding to internal panel.
-  static int64 InternalDisplayId();
-  static void SetInternalDisplayId(int64 internal_display_id);
+  static int64_t InternalDisplayId();
+  static void SetInternalDisplayId(int64_t internal_display_id);
 
   // Test if the |id| is for the internal display if any.
-  static bool IsInternalDisplayId(int64 id);
+  static bool IsInternalDisplayId(int64_t id);
 
   // True if there is an internal display.
   static bool HasInternalDisplay();
 
  private:
-  int64 id_;
+  int64_t id_;
   Rect bounds_;
   Rect work_area_;
   float device_scale_factor_;
   Rotation rotation_;
   TouchSupport touch_support_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_DISPLAY_H_