Switch to standard integer types in ash/.

ash/system/chromeos/tray_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 "ash/system/chromeos/tray_display.h"
 
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
@@ skipping 23 matching lines @@
 
 using message_center::Notification;
 
 namespace ash {
 namespace {
 
 DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 
-base::string16 GetDisplayName(int64 display_id) {
+base::string16 GetDisplayName(int64_t display_id) {
   return base::UTF8ToUTF16(
       GetDisplayManager()->GetDisplayNameForId(display_id));
 }
 
-base::string16 GetDisplaySize(int64 display_id) {
+base::string16 GetDisplaySize(int64_t display_id) {
   DisplayManager* display_manager = GetDisplayManager();
 
   const gfx::Display* display = &display_manager->GetDisplayForId(display_id);
 
   // We don't show display size for mirrored display. Fallback
   // to empty string if this happens on release build.
   bool mirroring = display_manager->mirroring_display_id() == display_id;
   DCHECK(!mirroring);
   if (mirroring)
     return base::string16();
 
   DCHECK(display->is_valid());
   return base::UTF8ToUTF16(display->size().ToString());
 }
 
 // Returns 1-line information for the specified display, like
 // "InternalDisplay: 1280x750"
-base::string16 GetDisplayInfoLine(int64 display_id) {
+base::string16 GetDisplayInfoLine(int64_t display_id) {
   const DisplayInfo& display_info =
       GetDisplayManager()->GetDisplayInfo(display_id);
   if (GetDisplayManager()->mirroring_display_id() == display_id)
     return GetDisplayName(display_id);
 
   base::string16 size_text = GetDisplaySize(display_id);
   base::string16 display_data;
   if (display_info.has_overscan()) {
     display_data = l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION,
         size_text,
         l10n_util::GetStringUTF16(
             IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION_OVERSCAN));
   } else {
     display_data = size_text;
   }
 
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
       GetDisplayName(display_id),
       display_data);
 }
 
 base::string16 GetAllDisplayInfo() {
   DisplayManager* display_manager = GetDisplayManager();
   std::vector<base::string16> lines;
-  int64 internal_id = gfx::Display::kInvalidDisplayID;
+  int64_t internal_id = gfx::Display::kInvalidDisplayID;
   // Make sure to show the internal display first.
   if (!display_manager->IsInUnifiedMode() &&
       gfx::Display::IsInternalDisplayId(display_manager->first_display_id())) {
     internal_id = display_manager->first_display_id();
     lines.push_back(GetDisplayInfoLine(internal_id));
   }
 
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
-    int64 id = display_manager->GetDisplayAt(i).id();
+    int64_t id = display_manager->GetDisplayAt(i).id();
     if (id == internal_id)
       continue;
     lines.push_back(GetDisplayInfoLine(id));
   }
 
   return base::JoinString(lines, base::ASCIIToUTF16("\n"));
 }
 
 void OpenSettings() {
   // switch is intentionally introduced without default, to cause an error when
@@ skipping 67 matching lines @@
     return true;
   }
 
   // Returns the name of the currently connected external display.
   // This should not be used when the external display is used for
   // mirroring.
   static base::string16 GetExternalDisplayName() {
     DisplayManager* display_manager = GetDisplayManager();
     DCHECK(!display_manager->IsInMirrorMode());
 
-    int64 external_id = gfx::Display::kInvalidDisplayID;
+    int64_t external_id = gfx::Display::kInvalidDisplayID;
     for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
-      int64 id = display_manager->GetDisplayAt(i).id();
+      int64_t id = display_manager->GetDisplayAt(i).id();
       if (!gfx::Display::IsInternalDisplayId(id)) {
         external_id = id;
         break;
       }
     }
 
     if (external_id == gfx::Display::kInvalidDisplayID) {
       return l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
     }
@@ skipping 38 matching lines @@
             IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING,
             GetDisplayName(display_manager->mirroring_display_id()));
       }
       return l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING_NO_INTERNAL);
     }
 
     if (display_manager->IsInUnifiedMode())
       return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_UNIFIED);
 
-    int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
+    int64_t primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
     if (gfx::Display::HasInternalDisplay() &&
         !(gfx::Display::IsInternalDisplayId(primary_id))) {
       if (additional_message_out) {
         *additional_message_out = ash::SubstituteChromeOSDeviceType(
             IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION);
       }
       return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED);
     }
 
     return base::string16();
@@ skipping 38 matching lines @@
   Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 }
 
 void TrayDisplay::UpdateDisplayInfo(TrayDisplay::DisplayInfoMap* old_info) {
   if (old_info)
     old_info->swap(display_info_);
   display_info_.clear();
 
   DisplayManager* display_manager = GetDisplayManager();
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
-    int64 id = display_manager->GetDisplayAt(i).id();
+    int64_t id = display_manager->GetDisplayAt(i).id();
     display_info_[id] = display_manager->GetDisplayInfo(id);
   }
 }
 
 bool TrayDisplay::GetDisplayMessageForNotification(
     const TrayDisplay::DisplayInfoMap& old_info,
     base::string16* message_out,
     base::string16* additional_message_out) {
   // Display is added or removed. Use the same message as the one in
   // the system tray.
@@ skipping 120 matching lines @@
 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
   views::View* view = default_;
   if (view) {
     view->GetAccessibleState(state);
     return true;
   }
   return false;
 }
 
 }  // namespace ash