Add kAccessibilityFocusFallsbackToWidget property

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/ptr_util.h"
 #include "base/memory/singleton.h"
+#include "base/strings/string_util.h"
+#include "ui/aura/client/aura_constants.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 {
@@ skipping 134 matching lines @@
   if (!focused_widget)
     return nullptr;
 
   FocusManager* focus_manager = focused_widget->GetFocusManager();
   if (!focus_manager)
     return nullptr;
 
   View* focused_view = focus_manager->GetFocusedView();
   if (focused_view)
     return focused_view;
-  else
+
+  if (focused_window->GetProperty(
+          aura::client::kAccessibilityFocusFallsbackToWidgetKey)) {
+    // If no view is focused, falls back to root view.
     return focused_widget->GetRootView();
+  } else {

[sky, 2016/12/08 16:07:18]

chromium style is no else after a return

[yawano, 2016/12/09 01:40:00]

Done.

+    return nullptr;
+  }
 }
 
 void AXAuraObjCache::OnWindowFocused(aura::Window* gained_focus,
                                      aura::Window* lost_focus) {
   OnFocusedViewChanged();
 }
 
 void AXAuraObjCache::OnWindowDestroying(aura::Window* window) {
   focus_client_ = nullptr;
 }
@@ skipping 36 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