Switch to standard integer types in ash/.

ash/display/display_layout_store.cc

 // Copyright 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.
 
 #include <stdio.h>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
@@ skipping 28 matching lines @@
 DisplayLayoutStore::~DisplayLayoutStore() {
 }
 
 void DisplayLayoutStore::SetDefaultDisplayLayout(const DisplayLayout& layout) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kAshSecondaryDisplayLayout))
     default_display_layout_ = layout;
 }
 
 void DisplayLayoutStore::RegisterLayoutForDisplayIdPair(
-    int64 id1,
-    int64 id2,
+    int64_t id1,
+    int64_t id2,
     const DisplayLayout& layout) {
   auto key = CreateDisplayIdPair(id1, id2);
   paired_layouts_[key] = layout;
 }
 
 DisplayLayout DisplayLayoutStore::GetRegisteredDisplayLayout(
     const DisplayIdPair& pair) {
   std::map<DisplayIdPair, DisplayLayout>::const_iterator iter =
       paired_layouts_.find(pair);
   return
@@ skipping 13 matching lines @@
 void DisplayLayoutStore::UpdateMultiDisplayState(const DisplayIdPair& pair,
                                                  bool mirrored,
                                                  bool default_unified) {
   if (paired_layouts_.find(pair) == paired_layouts_.end())
     CreateDisplayLayout(pair);
   paired_layouts_[pair].mirrored = mirrored;
   paired_layouts_[pair].default_unified = default_unified;
 }
 
 void DisplayLayoutStore::UpdatePrimaryDisplayId(const DisplayIdPair& pair,
-                                                int64 display_id) {
+                                                int64_t display_id) {
   if (paired_layouts_.find(pair) == paired_layouts_.end())
     CreateDisplayLayout(pair);
   paired_layouts_[pair].primary_id = display_id;
 }
 
 DisplayLayout DisplayLayoutStore::CreateDisplayLayout(
     const DisplayIdPair& pair) {
   DisplayLayout layout = default_display_layout_;
   layout.primary_id = pair.first;
   paired_layouts_[pair] = layout;
   return layout;
 }
 
 }  // namespace ash