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

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

Issue 1040863002: Revert "Enable chrome.automation.getDesktop on all aura platforms." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « ui/views/accessibility/ax_aura_obj_cache.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ui/views/accessibility/ax_aura_obj_cache.h" 5 #include "ui/views/accessibility/ax_aura_obj_cache.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/views/accessibility/ax_aura_obj_wrapper.h" 10 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 void AXAuraObjCache::Remove(int32 id) { 69 void AXAuraObjCache::Remove(int32 id) {
70 AXAuraObjWrapper* obj = Get(id); 70 AXAuraObjWrapper* obj = Get(id);
71 71
72 if (id == -1 || !obj) 72 if (id == -1 || !obj)
73 return; 73 return;
74 74
75 cache_.erase(id); 75 cache_.erase(id);
76 delete obj; 76 delete obj;
77 } 77 }
78 78
79 void AXAuraObjCache::GetTopLevelWindows(
80 std::vector<AXAuraObjWrapper*>* children) {
81 for (std::map<aura::Window*, int32>::iterator it = window_to_id_map_.begin();
82 it != window_to_id_map_.end(); ++it) {
83 if (!it->first->parent())
84 children->push_back(GetOrCreate(it->first));
85 }
86 }
87
88 AXAuraObjCache::AXAuraObjCache() : current_id_(1), is_destroying_(false) { 79 AXAuraObjCache::AXAuraObjCache() : current_id_(1), is_destroying_(false) {
89 } 80 }
90 81
91 AXAuraObjCache::~AXAuraObjCache() { 82 AXAuraObjCache::~AXAuraObjCache() {
92 is_destroying_ = true; 83 is_destroying_ = true;
93 STLDeleteContainerPairSecondPointers(cache_.begin(), cache_.end()); 84 STLDeleteContainerPairSecondPointers(cache_.begin(), cache_.end());
94 cache_.clear(); 85 cache_.clear();
95 } 86 }
96 87
97 template <typename AuraViewWrapper, typename AuraView> 88 template <typename AuraViewWrapper, typename AuraView>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 void AXAuraObjCache::RemoveInternal( 122 void AXAuraObjCache::RemoveInternal(
132 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) { 123 AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) {
133 int32 id = GetID(aura_view); 124 int32 id = GetID(aura_view);
134 if (id == -1) 125 if (id == -1)
135 return; 126 return;
136 aura_view_to_id_map.erase(aura_view); 127 aura_view_to_id_map.erase(aura_view);
137 Remove(id); 128 Remove(id);
138 } 129 }
139 130
140 } // namespace views 131 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/accessibility/ax_aura_obj_cache.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698