Switch to standard integer types in ash/.

ash/display/display_layout_store.h

Index: ash/display/display_layout_store.h
diff --git a/ash/display/display_layout_store.h b/ash/display/display_layout_store.h
index 6841ea906aa5f8057d0f6b408be2cde03a1a49d1..7519ec4c16705a6ada6c2e434f7030c029918f03 100644
--- a/ash/display/display_layout_store.h
+++ b/ash/display/display_layout_store.h
@@ -5,10 +5,13 @@
 #ifndef ASH_DISPLAY_DISPLAY_LAYOUT_STORE_H_
 #define ASH_DISPLAY_DISPLAY_LAYOUT_STORE_H_
 
+#include <stdint.h>
+
 #include <map>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_layout.h"
+#include "base/macros.h"
 
 namespace ash {
 
@@ -23,8 +26,8 @@ class ASH_EXPORT DisplayLayoutStore {
   void SetDefaultDisplayLayout(const DisplayLayout& layout);
 
   // Registeres the display layout info for the specified display(s).
-  void RegisterLayoutForDisplayIdPair(int64 id1,
-                                      int64 id2,
+  void RegisterLayoutForDisplayIdPair(int64_t id1,
+                                      int64_t id2,
                                       const DisplayLayout& layout);
 
   // If no layout is registered, it creatas new layout using
@@ -48,7 +51,7 @@ class ASH_EXPORT DisplayLayoutStore {
   // |display_pair|.  This creates new display layout if no layout is
   // registered for |display_pair|.
   void UpdatePrimaryDisplayId(const DisplayIdPair& display_pair,
-                              int64 display_id);
+                              int64_t display_id);
 
  private:
   // Creates new layout for display pair from |default_display_layout_|.