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 #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/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
9 #include "ui/aura/client/focus_client.h" | 9 #include "ui/aura/client/focus_client.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 if (!focused_widget) | 153 if (!focused_widget) |
154 return nullptr; | 154 return nullptr; |
155 | 155 |
156 FocusManager* focus_manager = focused_widget->GetFocusManager(); | 156 FocusManager* focus_manager = focused_widget->GetFocusManager(); |
157 if (!focus_manager) | 157 if (!focus_manager) |
158 return nullptr; | 158 return nullptr; |
159 | 159 |
160 View* focused_view = focus_manager->GetFocusedView(); | 160 View* focused_view = focus_manager->GetFocusedView(); |
161 if (focused_view) | 161 if (focused_view) |
162 return focused_view; | 162 return focused_view; |
| 163 |
| 164 // If no view is focused, falls back to accessibility focusable root view. |
| 165 View* root_view = focused_widget->GetRootView(); |
| 166 if (root_view != nullptr && root_view->IsAccessibilityFocusable()) |
| 167 return root_view; |
163 else | 168 else |
164 return focused_widget->GetRootView(); | 169 return nullptr; |
165 } | 170 } |
166 | 171 |
167 void AXAuraObjCache::OnWindowFocused(aura::Window* gained_focus, | 172 void AXAuraObjCache::OnWindowFocused(aura::Window* gained_focus, |
168 aura::Window* lost_focus) { | 173 aura::Window* lost_focus) { |
169 OnFocusedViewChanged(); | 174 OnFocusedViewChanged(); |
170 } | 175 } |
171 | 176 |
172 void AXAuraObjCache::OnWindowDestroying(aura::Window* window) { | 177 void AXAuraObjCache::OnWindowDestroying(aura::Window* window) { |
173 focus_client_ = nullptr; | 178 focus_client_ = nullptr; |
174 } | 179 } |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 AuraView* aura_view, | 216 AuraView* aura_view, |
212 std::map<AuraView*, int32_t>& aura_view_to_id_map) { | 217 std::map<AuraView*, int32_t>& aura_view_to_id_map) { |
213 int32_t id = GetID(aura_view); | 218 int32_t id = GetID(aura_view); |
214 if (id == -1) | 219 if (id == -1) |
215 return; | 220 return; |
216 aura_view_to_id_map.erase(aura_view); | 221 aura_view_to_id_map.erase(aura_view); |
217 Remove(id); | 222 Remove(id); |
218 } | 223 } |
219 | 224 |
220 } // namespace views | 225 } // namespace views |
OLD | NEW |