Index: ui/views/accessibility/ax_aura_obj_cache.h |
diff --git a/ui/views/accessibility/ax_aura_obj_cache.h b/ui/views/accessibility/ax_aura_obj_cache.h |
index 95c46f387104a498287303f6c2689f05a71d510d..a7bb50c99b42c67e8bc54da21f89fb9f2d3c14a4 100644 |
--- a/ui/views/accessibility/ax_aura_obj_cache.h |
+++ b/ui/views/accessibility/ax_aura_obj_cache.h |
@@ -5,10 +5,12 @@ |
#ifndef UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ |
#define UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ |
+#include <stdint.h> |
+ |
#include <map> |
#include <vector> |
-#include "base/basictypes.h" |
+#include "base/macros.h" |
#include "ui/views/views_export.h" |
namespace base { |
@@ -36,13 +38,13 @@ class VIEWS_EXPORT AXAuraObjCache { |
AXAuraObjWrapper* GetOrCreate(aura::Window* window); |
// Gets an id given an Aura view. |
- int32 GetID(View* view); |
- int32 GetID(Widget* widget); |
- int32 GetID(aura::Window* window); |
+ int32_t GetID(View* view); |
+ int32_t GetID(Widget* widget); |
+ int32_t GetID(aura::Window* window); |
// Gets the next unique id for this cache. Useful for non-Aura view backed |
// views. |
- int32 GetNextID() { return current_id_++; } |
+ int32_t GetNextID() { return current_id_++; } |
// Removes an entry from this cache based on an Aura view. |
void Remove(View* view); |
@@ -53,10 +55,10 @@ class VIEWS_EXPORT AXAuraObjCache { |
void RemoveViewSubtree(View* view); |
// Lookup a cached entry based on an id. |
- AXAuraObjWrapper* Get(int32 id); |
+ AXAuraObjWrapper* Get(int32_t id); |
// Remove a cached entry based on an id. |
- void Remove(int32 id); |
+ void Remove(int32_t id); |
// Get all top level windows this cache knows about. |
void GetTopLevelWindows(std::vector<AXAuraObjWrapper*>* children); |
@@ -71,21 +73,24 @@ class VIEWS_EXPORT AXAuraObjCache { |
virtual ~AXAuraObjCache(); |
template <typename AuraViewWrapper, typename AuraView> |
- AXAuraObjWrapper* CreateInternal( |
- AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); |
+ AXAuraObjWrapper* CreateInternal( |
+ AuraView* aura_view, |
+ std::map<AuraView*, int32_t>& aura_view_to_id_map); |
- template<typename AuraView> int32 GetIDInternal( |
- AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); |
+ template <typename AuraView> |
+ int32_t GetIDInternal(AuraView* aura_view, |
+ std::map<AuraView*, int32_t>& aura_view_to_id_map); |
- template<typename AuraView> void RemoveInternal( |
- AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); |
+ template <typename AuraView> |
+ void RemoveInternal(AuraView* aura_view, |
+ std::map<AuraView*, int32_t>& aura_view_to_id_map); |
- std::map<views::View*, int32> view_to_id_map_; |
- std::map<views::Widget*, int32> widget_to_id_map_; |
- std::map<aura::Window*, int32> window_to_id_map_; |
+ std::map<views::View*, int32_t> view_to_id_map_; |
+ std::map<views::Widget*, int32_t> widget_to_id_map_; |
+ std::map<aura::Window*, int32_t> window_to_id_map_; |
- std::map<int32, AXAuraObjWrapper*> cache_; |
- int32 current_id_; |
+ std::map<int32_t, AXAuraObjWrapper*> cache_; |
+ int32_t current_id_; |
// True immediately when entering this object's destructor. |
bool is_destroying_; |