Switch to standard integer types in content/browser/.

content/browser/accessibility/accessibility_tree_formatter_utils_win.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 "content/browser/accessibility/accessibility_tree_formatter_utils_win.h"
 
 #include <oleacc.h>
 
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 
 namespace content {
 namespace {
 
 class AccessibilityEnumMap {
  public:
   static AccessibilityEnumMap* GetInstance();
 
-  std::map<int32, base::string16> ia_role_string_map;
-  std::map<int32, base::string16> ia2_role_string_map;
-  std::map<int32, base::string16> ia_state_string_map;
-  std::map<int32, base::string16> ia2_state_string_map;
-  std::map<int32, base::string16> event_string_map;
+  std::map<int32_t, base::string16> ia_role_string_map;
+  std::map<int32_t, base::string16> ia2_role_string_map;
+  std::map<int32_t, base::string16> ia_state_string_map;
+  std::map<int32_t, base::string16> ia2_state_string_map;
+  std::map<int32_t, base::string16> event_string_map;
 
  private:
   AccessibilityEnumMap();
   virtual ~AccessibilityEnumMap() {}
 
   friend struct base::DefaultSingletonTraits<AccessibilityEnumMap>;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityEnumMap);
 };
 
@@ skipping 248 matching lines @@
   EVENT_MAP(IA2_EVENT_TEXT_COLUMN_CHANGED)
   EVENT_MAP(IA2_EVENT_TEXT_INSERTED)
   EVENT_MAP(IA2_EVENT_TEXT_REMOVED)
   EVENT_MAP(IA2_EVENT_TEXT_UPDATED)
   EVENT_MAP(IA2_EVENT_TEXT_SELECTION_CHANGED)
   EVENT_MAP(IA2_EVENT_VISIBLE_DATA_CHANGED)
 }
 
 }  // namespace.
 
-base::string16 IAccessibleRoleToString(int32 ia_role) {
+base::string16 IAccessibleRoleToString(int32_t ia_role) {
   return AccessibilityEnumMap::GetInstance()->ia_role_string_map[ia_role];
 }
 
-base::string16 IAccessible2RoleToString(int32 ia_role) {
+base::string16 IAccessible2RoleToString(int32_t ia_role) {
   return AccessibilityEnumMap::GetInstance()->ia2_role_string_map[ia_role];
 }
 
-void IAccessibleStateToStringVector(int32 ia_state,
+void IAccessibleStateToStringVector(int32_t ia_state,
                                     std::vector<base::string16>* result) {
-  const std::map<int32, base::string16>& state_string_map =
+  const std::map<int32_t, base::string16>& state_string_map =
       AccessibilityEnumMap::GetInstance()->ia_state_string_map;
-  std::map<int32, base::string16>::const_iterator it;
+  std::map<int32_t, base::string16>::const_iterator it;
   for (it = state_string_map.begin(); it != state_string_map.end(); ++it) {
     if (it->first & ia_state)
       result->push_back(it->second);
   }
 }
 
-base::string16 IAccessibleStateToString(int32 ia_state) {
+base::string16 IAccessibleStateToString(int32_t ia_state) {
   std::vector<base::string16> strings;
   IAccessibleStateToStringVector(ia_state, &strings);
   return base::JoinString(strings, base::ASCIIToUTF16(","));
 }
 
-void IAccessible2StateToStringVector(int32 ia2_state,
+void IAccessible2StateToStringVector(int32_t ia2_state,
                                      std::vector<base::string16>* result) {
-  const std::map<int32, base::string16>& state_string_map =
+  const std::map<int32_t, base::string16>& state_string_map =
       AccessibilityEnumMap::GetInstance()->ia2_state_string_map;
-  std::map<int32, base::string16>::const_iterator it;
+  std::map<int32_t, base::string16>::const_iterator it;
   for (it = state_string_map.begin(); it != state_string_map.end(); ++it) {
     if (it->first & ia2_state)
       result->push_back(it->second);
   }
 }
 
-base::string16 IAccessible2StateToString(int32 ia2_state) {
+base::string16 IAccessible2StateToString(int32_t ia2_state) {
   std::vector<base::string16> strings;
   IAccessible2StateToStringVector(ia2_state, &strings);
   return base::JoinString(strings, base::ASCIIToUTF16(","));
 }
 
-base::string16 AccessibilityEventToString(int32 event_id) {
+base::string16 AccessibilityEventToString(int32_t event_id) {
   return AccessibilityEnumMap::GetInstance()->event_string_map[event_id];
 }
 
 }  // namespace content