Switch to standard integer types in ash/.

ash/display/resolution_notification_controller.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 "ash/display/resolution_notification_controller.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
@@ skipping 75 matching lines @@
 }  // namespace
 
 // static
 const int ResolutionNotificationController::kTimeoutInSec = 15;
 
 // static
 const char ResolutionNotificationController::kNotificationId[] =
     "chrome://settings/display/resolution";
 
 struct ResolutionNotificationController::ResolutionChangeInfo {
-  ResolutionChangeInfo(int64 display_id,
+  ResolutionChangeInfo(int64_t display_id,
                        const DisplayMode& old_resolution,
                        const DisplayMode& new_resolution,
                        const base::Closure& accept_callback);
   ~ResolutionChangeInfo();
 
   // The id of the display where the resolution change happens.
-  int64 display_id;
+  int64_t display_id;
 
   // The resolution before the change.
   DisplayMode old_resolution;
 
   // The requested resolution. Note that this may be different from
   // |current_resolution| which is the actual resolution set.
   DisplayMode new_resolution;
 
   // The actual resolution after the change.
   DisplayMode current_resolution;
 
   // The callback when accept is chosen.
   base::Closure accept_callback;
 
   // The remaining timeout in seconds. 0 if the change does not time out.
-  uint8 timeout_count;
+  uint8_t timeout_count;
 
   // The timer to invoke OnTimerTick() every second. This cannot be
   // OneShotTimer since the message contains text "automatically closed in xx
   // seconds..." which has to be updated every second.
   base::RepeatingTimer timer;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResolutionChangeInfo);
 };
 
 ResolutionNotificationController::ResolutionChangeInfo::ResolutionChangeInfo(
-    int64 display_id,
+    int64_t display_id,
     const DisplayMode& old_resolution,
     const DisplayMode& new_resolution,
     const base::Closure& accept_callback)
     : display_id(display_id),
       old_resolution(old_resolution),
       new_resolution(new_resolution),
       accept_callback(accept_callback),
       timeout_count(0) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!gfx::Display::HasInternalDisplay() &&
@@ skipping 10 matching lines @@
   Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
   Shell::GetScreen()->AddObserver(this);
 }
 
 ResolutionNotificationController::~ResolutionNotificationController() {
   Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
   Shell::GetScreen()->RemoveObserver(this);
 }
 
 void ResolutionNotificationController::PrepareNotification(
-    int64 display_id,
+    int64_t display_id,
     const DisplayMode& old_resolution,
     const DisplayMode& new_resolution,
     const base::Closure& accept_callback) {
   DCHECK(!gfx::Display::IsInternalDisplayId(display_id));
   // If multiple resolution changes are invoked for the same display,
   // the original resolution for the first resolution change has to be used
   // instead of the specified |old_resolution|.
   DisplayMode original_resolution;
   if (change_info_ && change_info_->display_id == display_id) {
     DCHECK(change_info_->new_resolution.size == old_resolution.size);
@@ skipping 87 matching lines @@
   base::Closure callback = change_info_->accept_callback;
   change_info_.reset();
   callback.Run();
 }
 
 void ResolutionNotificationController::RevertResolutionChange() {
   message_center::MessageCenter::Get()->RemoveNotification(
       kNotificationId, false /* by_user */);
   if (!change_info_)
     return;
-  int64 display_id = change_info_->display_id;
+  int64_t display_id = change_info_->display_id;
   DisplayMode old_resolution = change_info_->old_resolution;
   change_info_.reset();
   Shell::GetInstance()->display_manager()->SetDisplayMode(
       display_id, old_resolution);
 }
 
 void ResolutionNotificationController::OnDisplayAdded(
     const gfx::Display& new_display) {
 }
 
@@ skipping 20 matching lines @@
                               this,
                               &ResolutionNotificationController::OnTimerTick);
   }
 }
 
 void ResolutionNotificationController::SuppressTimerForTest() {
   g_use_timer = false;
 }
 
 }  // namespace ash