Switch to standard integer types in ui/gfx/.

ui/gfx/display.cc

 // 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.
 
 #include "ui/gfx/display.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/switches.h"
 
 namespace gfx {
 namespace {
 
 // This variable tracks whether the forced device scale factor switch needs to
@@ skipping 18 matching lines @@
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kForceDeviceScaleFactor);
     if (!base::StringToDouble(value, &scale_in_double)) {
       LOG(ERROR) << "Failed to parse the default device scale factor:" << value;
       scale_in_double = 1.0;
     }
   }
   return static_cast<float>(scale_in_double);
 }
 
-int64 internal_display_id_ = -1;
+int64_t internal_display_id_ = -1;
 
 }  // namespace
 
 // static
 float Display::GetForcedDeviceScaleFactor() {
   if (g_forced_device_scale_factor < 0)
     g_forced_device_scale_factor = GetForcedDeviceScaleFactorImpl();
   return g_forced_device_scale_factor;
 }
 
@@ skipping 10 matching lines @@
   g_forced_device_scale_factor = -1.0;
 }
 
 Display::Display()
     : id_(kInvalidDisplayID),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0),
       touch_support_(TOUCH_SUPPORT_UNKNOWN) {
 }
 
-Display::Display(int64 id)
+Display::Display(int64_t id)
     : id_(id),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0),
-      touch_support_(TOUCH_SUPPORT_UNKNOWN) {
-}
+      touch_support_(TOUCH_SUPPORT_UNKNOWN) {}
 
-Display::Display(int64 id, const gfx::Rect& bounds)
+Display::Display(int64_t id, const gfx::Rect& bounds)
     : id_(id),
       bounds_(bounds),
       work_area_(bounds),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0),
       touch_support_(TOUCH_SUPPORT_UNKNOWN) {
 #if defined(USE_AURA)
   SetScaleAndBounds(device_scale_factor_, bounds);
 #endif
 }
@@ skipping 89 matching lines @@
       work_area_.ToString().c_str(),
       device_scale_factor_,
       IsInternal() ? "internal" : "external");
 }
 
 bool Display::IsInternal() const {
   return is_valid() && (id_ == internal_display_id_);
 }
 
 // static
-int64 Display::InternalDisplayId() {
+int64_t Display::InternalDisplayId() {
   DCHECK_NE(kInvalidDisplayID, internal_display_id_);
   return internal_display_id_;
 }
 
 // static
-void Display::SetInternalDisplayId(int64 internal_display_id) {
+void Display::SetInternalDisplayId(int64_t internal_display_id) {
   internal_display_id_ = internal_display_id;
 }
 
 // static
-bool Display::IsInternalDisplayId(int64 display_id) {
+bool Display::IsInternalDisplayId(int64_t display_id) {
   DCHECK_NE(kInvalidDisplayID, display_id);
   return HasInternalDisplay() && internal_display_id_ == display_id;
 }
 
 // static
 bool Display::HasInternalDisplay() {
   return internal_display_id_ != kInvalidDisplayID;
 }
 
 }  // namespace gfx