Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/display/display_preferences.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 "chrome/browser/chromeos/display/display_preferences.h"
 
+#include <stddef.h>
+
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 100 matching lines @@
        !it.IsAtEnd(); it.Advance()) {
     ash::DisplayLayout layout;
     if (!ash::DisplayLayout::ConvertFromValue(it.value(), &layout)) {
       LOG(WARNING) << "Invalid preference value for " << it.key();
       continue;
     }
 
     if (it.key().find(",") != std::string::npos) {
       std::vector<std::string> ids = base::SplitString(
           it.key(), ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-      int64 id1 = gfx::Display::kInvalidDisplayID;
-      int64 id2 = gfx::Display::kInvalidDisplayID;
+      int64_t id1 = gfx::Display::kInvalidDisplayID;
+      int64_t id2 = gfx::Display::kInvalidDisplayID;
       if (!base::StringToInt64(ids[0], &id1) ||
           !base::StringToInt64(ids[1], &id2) ||
           id1 == gfx::Display::kInvalidDisplayID ||
           id2 == gfx::Display::kInvalidDisplayID) {
         continue;
       }
       layout_store->RegisterLayoutForDisplayIdPair(id1, id2, layout);
     }
   }
 }
 
 void LoadDisplayProperties() {
   PrefService* local_state = g_browser_process->local_state();
   const base::DictionaryValue* properties = local_state->GetDictionary(
       prefs::kDisplayProperties);
   for (base::DictionaryValue::Iterator it(*properties);
        !it.IsAtEnd(); it.Advance()) {
     const base::DictionaryValue* dict_value = NULL;
     if (!it.value().GetAsDictionary(&dict_value) || dict_value == NULL)
       continue;
-    int64 id = gfx::Display::kInvalidDisplayID;
+    int64_t id = gfx::Display::kInvalidDisplayID;
     if (!base::StringToInt64(it.key(), &id) ||
         id == gfx::Display::kInvalidDisplayID) {
       continue;
     }
     gfx::Display::Rotation rotation = gfx::Display::ROTATE_0;
     float ui_scale = 1.0f;
     const gfx::Insets* insets_to_set = NULL;
 
     int rotation_value = 0;
     if (dict_value->GetInteger("rotation", &rotation_value)) {
@@ skipping 82 matching lines @@
 void StoreCurrentDisplayProperties() {
   ash::DisplayManager* display_manager = GetDisplayManager();
   PrefService* local_state = g_browser_process->local_state();
 
   DictionaryPrefUpdate update(local_state, prefs::kDisplayProperties);
   base::DictionaryValue* pref_data = update.Get();
 
   size_t num = display_manager->GetNumDisplays();
   for (size_t i = 0; i < num; ++i) {
     const gfx::Display& display = display_manager->GetDisplayAt(i);
-    int64 id = display.id();
+    int64_t id = display.id();
     ash::DisplayInfo info = display_manager->GetDisplayInfo(id);
 
     scoped_ptr<base::DictionaryValue> property_value(
         new base::DictionaryValue());
     // Don't save the display preference in unified mode because its
     // size and modes can change depending on the combination of displays.
     if (display_manager->IsInUnifiedMode())
       continue;
     property_value->SetInteger(
         "rotation",
@@ skipping 122 matching lines @@
     std::string value = local_state->GetString(prefs::kDisplayPowerState);
     chromeos::DisplayPowerState power_state;
     if (GetDisplayPowerStateFromString(value, &power_state)) {
       ash::Shell::GetInstance()->display_configurator()->SetInitialDisplayPower(
           power_state);
     }
   }
 }
 
 // Stores the display layout for given display pairs.
-void StoreDisplayLayoutPrefForTest(int64 id1,
-                                   int64 id2,
+void StoreDisplayLayoutPrefForTest(int64_t id1,
+                                   int64_t id2,
                                    const ash::DisplayLayout& layout) {
   StoreDisplayLayoutPref(ash::CreateDisplayIdPair(id1, id2), layout);
 }
 
 // Stores the given |power_state|.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
   StoreDisplayPowerState(power_state);
 }
 
 }  // namespace chromeos