Switch to standard integer types in ash/.

ash/display/display_util.cc

 // Copyright 2014 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 "ash/display/display_util.h"
 
 #include <algorithm>
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
@@ skipping 184 matching lines @@
   tmp.device_scale_factor = info.device_scale_factor();
   gfx::Size resolution = tmp.GetSizeInDIP(false);
   auto iter = std::find_if(modes.begin(), modes.end(),
                            [resolution](const DisplayMode& mode) {
                              return mode.GetSizeInDIP(false) == resolution;
                            });
   FindNextMode(iter, modes, up, out);
   return true;
 }
 
-bool SetDisplayUIScale(int64 id, float ui_scale) {
+bool SetDisplayUIScale(int64_t id, float ui_scale) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!display_manager->IsActiveDisplayId(id) ||
       !gfx::Display::IsInternalDisplayId(id)) {
     return false;
   }
   const DisplayInfo& info = display_manager->GetDisplayInfo(id);
   DisplayMode mode;
   if (!GetDisplayModeForUIScale(info, ui_scale, &mode))
     return false;
   return display_manager->SetDisplayMode(id, mode);
@@ skipping 125 matching lines @@
 
 int FindDisplayIndexContainingPoint(const std::vector<gfx::Display>& displays,
                                     const gfx::Point& point_in_screen) {
   auto iter = std::find_if(displays.begin(), displays.end(),
                            [point_in_screen](const gfx::Display& display) {
                              return display.bounds().Contains(point_in_screen);
                            });
   return iter == displays.end() ? -1 : (iter - displays.begin());
 }
 
-DisplayIdPair CreateDisplayIdPair(int64 id1, int64 id2) {
+DisplayIdPair CreateDisplayIdPair(int64_t id1, int64_t id2) {
   return CompareDisplayIds(id1, id2) ? std::make_pair(id1, id2)
                                      : std::make_pair(id2, id1);
 }
 
-bool CompareDisplayIds(int64 id1, int64 id2) {
+bool CompareDisplayIds(int64_t id1, int64_t id2) {
   DCHECK_NE(id1, id2);
   // Output index is stored in the first 8 bits. See GetDisplayIdFromEDID
   // in edid_parser.cc.
   int index_1 = id1 & 0xFF;
   int index_2 = id2 & 0xFF;
   DCHECK_NE(index_1, index_2) << id1 << " and " << id2;
   return gfx::Display::IsInternalDisplayId(id1) ||
          (index_1 < index_2 && !gfx::Display::IsInternalDisplayId(id2));
 }
 
 }  // namespace ash