Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: ui/views/accessibility/ax_aura_obj_cache.h

Issue 908853004: Revert of Reland #2: Ensure WebView notifies desktop automation on creation, destruction, and change Original (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 void Remove(View* view); 45 void Remove(View* view);
46 void Remove(Widget* widget); 46 void Remove(Widget* widget);
47 void Remove(aura::Window* window); 47 void Remove(aura::Window* window);
48 48
49 // Lookup a cached entry based on an id. 49 // Lookup a cached entry based on an id.
50 AXAuraObjWrapper* Get(int32 id); 50 AXAuraObjWrapper* Get(int32 id);
51 51
52 // Remove a cached entry based on an id. 52 // Remove a cached entry based on an id.
53 void Remove(int32 id); 53 void Remove(int32 id);
54 54
55 // Indicates if this object's currently being destroyed.
56 bool is_destroying() { return is_destroying_; }
57
58 private: 55 private:
59 friend struct DefaultSingletonTraits<AXAuraObjCache>; 56 friend struct DefaultSingletonTraits<AXAuraObjCache>;
60 57
61 AXAuraObjCache(); 58 AXAuraObjCache();
62 virtual ~AXAuraObjCache(); 59 virtual ~AXAuraObjCache();
63 60
64 template <typename AuraViewWrapper, typename AuraView> 61 template <typename AuraViewWrapper, typename AuraView>
65 AXAuraObjWrapper* CreateInternal( 62 AXAuraObjWrapper* CreateInternal(
66 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); 63 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map);
67 64
68 template<typename AuraView> int32 GetIDInternal( 65 template<typename AuraView> int32 GetIDInternal(
69 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); 66 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map);
70 67
71 template<typename AuraView> void RemoveInternal( 68 template<typename AuraView> void RemoveInternal(
72 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); 69 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map);
73 70
74 std::map<views::View*, int32> view_to_id_map_; 71 std::map<views::View*, int32> view_to_id_map_;
75 std::map<views::Widget*, int32> widget_to_id_map_; 72 std::map<views::Widget*, int32> widget_to_id_map_;
76 std::map<aura::Window*, int32> window_to_id_map_; 73 std::map<aura::Window*, int32> window_to_id_map_;
77 74
78 std::map<int32, AXAuraObjWrapper*> cache_; 75 std::map<int32, AXAuraObjWrapper*> cache_;
79 int32 current_id_; 76 int32 current_id_;
80 77
81 // True immediately when entering this object's destructor.
82 bool is_destroying_;
83
84 DISALLOW_COPY_AND_ASSIGN(AXAuraObjCache); 78 DISALLOW_COPY_AND_ASSIGN(AXAuraObjCache);
85 }; 79 };
86 80
87 } // namespace views 81 } // namespace views
88 82
89 #endif // UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ 83 #endif // UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_
OLDNEW
« no previous file with comments | « chrome/test/base/extension_load_waiter_one_shot.h ('k') | ui/views/accessibility/ax_aura_obj_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698