Switch to standard integer types in ash/.

ash/display/display_info.h

 // Copyright (c) 2013 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 ASH_DISPLAY_DISPLAY_INFO_H_
 #define ASH_DISPLAY_DISPLAY_INFO_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ skipping 58 matching lines @@
   //      1.0 ui scale.
   // "10+20-300x200/u@1.5"
   //      300x200 window at 10,20 origin. 1x device scale factor.
   //      no overscan. flipped upside-down (180 degree) and 1.5 ui scale.
   // "200x100#300x200|200x100%59.0|100x100%60"
   //      200x100 window at 0,0 origin, with 3 possible resolutions,
   //      300x200, 200x100 at 59 Hz, and 100x100 at 60 Hz.
   static DisplayInfo CreateFromSpec(const std::string& spec);
 
   // Creates a DisplayInfo from string spec using given |id|.
-  static DisplayInfo CreateFromSpecWithID(const std::string& spec,
-                                          int64 id);
+  static DisplayInfo CreateFromSpecWithID(const std::string& spec, int64_t id);
 
   // When this is set to true on the device whose internal display has
   // 1.25 dsf, Chrome uses 1.0f as a default scale factor, and uses
   // dsf 1.25 when UI scaling is set to 0.8f.
   static void SetUse125DSFForUIScalingForTest(bool enable);
 
   DisplayInfo();
-  DisplayInfo(int64 id, const std::string& name, bool has_overscan);
+  DisplayInfo(int64_t id, const std::string& name, bool has_overscan);
   ~DisplayInfo();
 
-  int64 id() const { return id_; }
+  int64_t id() const { return id_; }
 
   // The name of the display.
   const std::string& name() const { return name_; }
 
   // True if the display EDID has the overscan flag. This does not create the
   // actual overscan automatically, but used in the message.
   bool has_overscan() const { return has_overscan_; }
 
   void set_touch_support(gfx::Display::TouchSupport support) {
     touch_support_ = support;
@@ skipping 131 matching lines @@
 
   // Returns a string representation of the DisplayInfo, including display
   // modes.
   std::string ToFullString() const;
 
  private:
   // Returns true if this display should use DSF=1.25 for UI scaling; i.e.
   // SetUse125DSFForUIScaling(true) is called and this is the internal display.
   bool Use125DSFForUIScaling() const;
 
-  int64 id_;
+  int64_t id_;
   std::string name_;
   bool has_overscan_;
   std::map<gfx::Display::RotationSource, gfx::Display::Rotation> rotations_;
   gfx::Display::TouchSupport touch_support_;
 
   // The set of input devices associated with this display.
   std::vector<int> input_devices_;
 
   // This specifies the device's pixel density. (For example, a
   // display whose DPI is higher than the threshold is considered to have
@@ skipping 43 matching lines @@
   // If you add a new member, you need to update Copy().
 };
 
 // Resets the synthesized display id for testing. This
 // is necessary to avoid overflowing the output index.
 ASH_EXPORT void ResetDisplayIdForTest();
 
 }  // namespace ash
 
 #endif  //  ASH_DISPLAY_DISPLAY_INFO_H_