OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ | 5 #ifndef UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ |
6 #define UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ | 6 #define UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
| 11 #include <memory> |
11 #include <vector> | 12 #include <vector> |
12 | 13 |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
14 #include "ui/aura/client/focus_change_observer.h" | 15 #include "ui/aura/client/focus_change_observer.h" |
15 #include "ui/aura/window_observer.h" | 16 #include "ui/aura/window_observer.h" |
16 #include "ui/views/views_export.h" | 17 #include "ui/views/views_export.h" |
17 | 18 |
18 namespace base { | 19 namespace base { |
19 template <typename T> struct DefaultSingletonTraits; | 20 template <typename T> struct DefaultSingletonTraits; |
20 } | 21 } |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 const std::map<AuraView*, int32_t>& aura_view_to_id_map) const; | 113 const std::map<AuraView*, int32_t>& aura_view_to_id_map) const; |
113 | 114 |
114 template <typename AuraView> | 115 template <typename AuraView> |
115 void RemoveInternal(AuraView* aura_view, | 116 void RemoveInternal(AuraView* aura_view, |
116 std::map<AuraView*, int32_t>& aura_view_to_id_map); | 117 std::map<AuraView*, int32_t>& aura_view_to_id_map); |
117 | 118 |
118 std::map<views::View*, int32_t> view_to_id_map_; | 119 std::map<views::View*, int32_t> view_to_id_map_; |
119 std::map<views::Widget*, int32_t> widget_to_id_map_; | 120 std::map<views::Widget*, int32_t> widget_to_id_map_; |
120 std::map<aura::Window*, int32_t> window_to_id_map_; | 121 std::map<aura::Window*, int32_t> window_to_id_map_; |
121 | 122 |
122 std::map<int32_t, AXAuraObjWrapper*> cache_; | 123 std::map<int32_t, std::unique_ptr<AXAuraObjWrapper>> cache_; |
123 int32_t current_id_; | 124 int32_t current_id_; |
124 | 125 |
125 aura::client::FocusClient* focus_client_; | 126 aura::client::FocusClient* focus_client_; |
126 | 127 |
127 // True immediately when entering this object's destructor. | 128 // True immediately when entering this object's destructor. |
128 bool is_destroying_; | 129 bool is_destroying_; |
129 | 130 |
130 Delegate* delegate_; | 131 Delegate* delegate_; |
131 | 132 |
132 DISALLOW_COPY_AND_ASSIGN(AXAuraObjCache); | 133 DISALLOW_COPY_AND_ASSIGN(AXAuraObjCache); |
133 }; | 134 }; |
134 | 135 |
135 } // namespace views | 136 } // namespace views |
136 | 137 |
137 #endif // UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ | 138 #endif // UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ |
OLD | NEW |