Keep track of accessibility focus across windows.

ui/views/accessibility/ax_aura_obj_cache.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/accessibility/ax_aura_obj_cache.h"
 
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
 #include "ui/views/accessibility/ax_view_obj_wrapper.h"
 #include "ui/views/accessibility/ax_widget_obj_wrapper.h"
 #include "ui/views/accessibility/ax_window_obj_wrapper.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 // static
 AXAuraObjCache* AXAuraObjCache::GetInstance() {
   return base::Singleton<AXAuraObjCache>::get();
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(View* view) {
   return CreateInternal<AXViewObjWrapper>(view, view_to_id_map_);
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(Widget* widget) {
   return CreateInternal<AXWidgetObjWrapper>(widget, widget_to_id_map_);
 }
 
 AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(aura::Window* window) {
+  if (!focus_client_) {
+    aura::Window* root_window = window->GetRootWindow();
+    if (root_window) {
+      focus_client_ = aura::client::GetFocusClient(root_window);
+      if (focus_client_)
+        focus_client_->AddObserver(this);
+    }
+  }
   return CreateInternal<AXWindowObjWrapper>(window, window_to_id_map_);
 }
 
 int32_t AXAuraObjCache::GetID(View* view) {
   return GetIDInternal(view, view_to_id_map_);
 }
 
 int32_t AXAuraObjCache::GetID(Widget* widget) {
   return GetIDInternal(widget, widget_to_id_map_);
 }
@@ skipping 47 matching lines @@
 void AXAuraObjCache::GetTopLevelWindows(
     std::vector<AXAuraObjWrapper*>* children) {
   for (std::map<aura::Window*, int32_t>::iterator it =
            window_to_id_map_.begin();
        it != window_to_id_map_.end(); ++it) {
     if (!it->first->parent())
       children->push_back(GetOrCreate(it->first));
   }
 }
 
-AXAuraObjCache::AXAuraObjCache() : current_id_(1), is_destroying_(false) {
+AXAuraObjWrapper* AXAuraObjCache::GetFocus() {
+  View* focused_view = GetFocusedView();
+  if (focused_view)
+    return GetOrCreate(focused_view);
+  return nullptr;
+}
+
+AXAuraObjCache::AXAuraObjCache()
+    : current_id_(1),
+      focus_client_(nullptr),
+      is_destroying_(false) {
 }
 
 AXAuraObjCache::~AXAuraObjCache() {
+  //if (focus_client_)

[David Tseng, 2016/01/28 02:00:56]

nit: remove

[dmazzoni, 2016/01/30 00:02:41]

Done.

+  //  focus_client_->RemoveObserver(this);
   is_destroying_ = true;
   STLDeleteContainerPairSecondPointers(cache_.begin(), cache_.end());
   cache_.clear();
 }
 
+View* AXAuraObjCache::GetFocusedView() {
+  if (!focus_client_)
+    return nullptr;
+
+  aura::Window* focused_window = focus_client_->GetFocusedWindow();
+  if (!focused_window)
+    return nullptr;
+
+  Widget* focused_widget = Widget::GetWidgetForNativeView(focused_window);
+  while (!focused_widget) {
+    focused_window = focused_window->parent();
+    if (!focused_window)
+      break;
+
+    focused_widget = Widget::GetWidgetForNativeView(focused_window);

[David Tseng, 2016/01/28 02:00:56]

Do we want to break once we find a non-null widget?

[dmazzoni, 2016/01/30 00:02:41]

Not necessary since this is at the bottom of the while loop, right?

+  }
+
+  if (!focused_widget)
+    return nullptr;
+
+  FocusManager* focus_manager = focused_widget->GetFocusManager();
+  if (!focus_manager)
+    return nullptr;
+
+  return focus_manager->GetFocusedView();
+}
+
+void AXAuraObjCache::OnWindowFocused(aura::Window* gained_focus,
+                                     aura::Window* lost_focus) {
+  View* view = GetFocusedView();
+  if (view)
+    view->NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
+}
+
 template <typename AuraViewWrapper, typename AuraView>
 AXAuraObjWrapper* AXAuraObjCache::CreateInternal(
     AuraView* aura_view,
     std::map<AuraView*, int32_t>& aura_view_to_id_map) {
   if (!aura_view)
     return NULL;
 
   typename std::map<AuraView*, int32_t>::iterator it =
       aura_view_to_id_map.find(aura_view);
 
@@ skipping 28 matching lines @@
     AuraView* aura_view,
     std::map<AuraView*, int32_t>& aura_view_to_id_map) {
   int32_t id = GetID(aura_view);
   if (id == -1)
     return;
   aura_view_to_id_map.erase(aura_view);
   Remove(id);
 }
 
 }  // namespace views