Switch to standard integer types in ui/views/.

ui/views/accessibility/ax_aura_obj_cache.cc

 // Copyright 2014 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/views/accessibility/ax_aura_obj_cache.h"
 
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
@@ skipping 15 matching lines @@
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(Widget* widget) {
   return CreateInternal<AXWidgetObjWrapper>(widget, widget_to_id_map_);
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(aura::Window* window) {
   return CreateInternal<AXWindowObjWrapper>(window, window_to_id_map_);
 }
 
-int32 AXAuraObjCache::GetID(View* view) {
+int32_t AXAuraObjCache::GetID(View* view) {
   return GetIDInternal(view, view_to_id_map_);
 }
 
-int32 AXAuraObjCache::GetID(Widget* widget) {
+int32_t AXAuraObjCache::GetID(Widget* widget) {
   return GetIDInternal(widget, widget_to_id_map_);
 }
 
-int32 AXAuraObjCache::GetID(aura::Window* window) {
+int32_t AXAuraObjCache::GetID(aura::Window* window) {
   return GetIDInternal(window, window_to_id_map_);
 }
 
 void AXAuraObjCache::Remove(View* view) {
   RemoveInternal(view, view_to_id_map_);
 }
 
 void AXAuraObjCache::RemoveViewSubtree(View* view) {
   Remove(view);
   for (int i = 0; i < view->child_count(); ++i)
     RemoveViewSubtree(view->child_at(i));
 }
 
 void AXAuraObjCache::Remove(Widget* widget) {
   RemoveInternal(widget, widget_to_id_map_);
 
   // When an entire widget is deleted, it doesn't always send a notification
   // on each of its views, so we need to explore them recursively.
   if (widget->GetRootView())
     RemoveViewSubtree(widget->GetRootView());
 }
 
 void AXAuraObjCache::Remove(aura::Window* window) {
   RemoveInternal(window, window_to_id_map_);
 }
 
-AXAuraObjWrapper* AXAuraObjCache::Get(int32 id) {
-  std::map<int32, AXAuraObjWrapper*>::iterator it = cache_.find(id);
+AXAuraObjWrapper* AXAuraObjCache::Get(int32_t id) {
+  std::map<int32_t, AXAuraObjWrapper*>::iterator it = cache_.find(id);
 
   if (it == cache_.end())
     return NULL;
 
   return it->second;
 }
 
-void AXAuraObjCache::Remove(int32 id) {
+void AXAuraObjCache::Remove(int32_t id) {
   AXAuraObjWrapper* obj = Get(id);
 
   if (id == -1 || !obj)
     return;
 
   cache_.erase(id);
   delete obj;
 }
 
 void AXAuraObjCache::GetTopLevelWindows(
     std::vector<AXAuraObjWrapper*>* children) {
-  for (std::map<aura::Window*, int32>::iterator it = window_to_id_map_.begin();
+  for (std::map<aura::Window*, int32_t>::iterator it =
+           window_to_id_map_.begin();
        it != window_to_id_map_.end(); ++it) {
     if (!it->first->parent())
       children->push_back(GetOrCreate(it->first));
   }
 }
 
 AXAuraObjCache::AXAuraObjCache() : current_id_(1), is_destroying_(false) {
 }
 
 AXAuraObjCache::~AXAuraObjCache() {
   is_destroying_ = true;
   STLDeleteContainerPairSecondPointers(cache_.begin(), cache_.end());
   cache_.clear();
 }
 
 template <typename AuraViewWrapper, typename AuraView>
 AXAuraObjWrapper* AXAuraObjCache::CreateInternal(
-    AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) {
+    AuraView* aura_view,
+    std::map<AuraView*, int32_t>& aura_view_to_id_map) {
   if (!aura_view)
     return NULL;
 
-  typename std::map<AuraView*, int32>::iterator it =
+  typename std::map<AuraView*, int32_t>::iterator it =
       aura_view_to_id_map.find(aura_view);
 
   if (it != aura_view_to_id_map.end())
     return Get(it->second);
 
   AXAuraObjWrapper* wrapper = new AuraViewWrapper(aura_view);
   aura_view_to_id_map[aura_view] = current_id_;
   cache_[current_id_] = wrapper;
   current_id_++;
   return wrapper;
 }
 
-template<typename AuraView> int32 AXAuraObjCache::GetIDInternal(
-    AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) {
+template <typename AuraView>
+int32_t AXAuraObjCache::GetIDInternal(
+    AuraView* aura_view,
+    std::map<AuraView*, int32_t>& aura_view_to_id_map) {
   if (!aura_view)
     return -1;
 
-  typename std::map<AuraView*, int32>::iterator it =
+  typename std::map<AuraView*, int32_t>::iterator it =
       aura_view_to_id_map.find(aura_view);
 
   if (it != aura_view_to_id_map.end())
     return it->second;
 
   return -1;
 }
 
-template<typename AuraView>
+template <typename AuraView>
 void AXAuraObjCache::RemoveInternal(
-    AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) {
-  int32 id = GetID(aura_view);
+    AuraView* aura_view,
+    std::map<AuraView*, int32_t>& aura_view_to_id_map) {
+  int32_t id = GetID(aura_view);
   if (id == -1)
     return;
   aura_view_to_id_map.erase(aura_view);
   Remove(id);
 }
 
 }  // namespace views