Added battery level and time to the status tray's accessible name.

chrome/browser/ui/views/accessibility/accessibility_event_router_views.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 using views::FocusManager;
 
 AccessibilityEventRouterViews::AccessibilityEventRouterViews()
-    : most_recent_profile_(NULL) {
+    : most_recent_profile_(NULL), most_recent_view_(NULL) {

[Daniel Erat, 2014/07/09 23:10:24]

nit: one per line if they don't all fit on the same line as the method signature

[evy, 2014/07/10 17:19:57]

Done.

   // Register for notification when profile is destroyed to ensure that all
   // observers are detatched at that time.
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                  content::NotificationService::AllSources());
 }
 
 AccessibilityEventRouterViews::~AccessibilityEventRouterViews() {
 }
 
 // static
@@ skipping 116 matching lines @@
   most_recent_profile_ = profile;
 
   if (type == ui::AX_EVENT_MENU_START ||
       type == ui::AX_EVENT_MENU_POPUP_START ||
       type == ui::AX_EVENT_MENU_END ||
       type == ui::AX_EVENT_MENU_POPUP_END) {
     SendMenuNotification(view, type, profile);
     return;
   }
 
+  // The highest focusable view is processed to handle cases where there are
+  // focusable views inside other focusable views (e.g. hover for date text
+  // on the status bar) and the status bar information should be read instead
+  // of the specific button inside.
+  views::View* highest_focusable_view = view;
+  while (view->parent()) {
+    view = view->parent();
+    if (view->IsFocusable()) {
+      highest_focusable_view = view;
+    }
+  }
+  view = highest_focusable_view;
+
+  // Since multiple items could share a highest focusable view, these items
+  // could all dispatch the same accessibility hover events, which isn't
+  // necessary.
+  if (type == ui::AX_EVENT_HOVER &&
+       most_recent_view_ &&

[Peter Lundblad, 2014/07/09 23:08:11]

view must be non-null here, so this check is redundant AFAICT.

[Daniel Erat, 2014/07/09 23:10:24]

nit: fix indenting

also, view seems to be non-NULL based on the previous code, so this line doesn't
seem like it's necessary

[evy, 2014/07/10 17:19:57]

Done.

[evy, 2014/07/10 17:19:57]

Done.

+      most_recent_view_ == view) {
+    return;
+  }
+  most_recent_view_ = view;
+
   ui::AXViewState state;
   view->GetAccessibleState(&state);
 
   if (type == ui::AX_EVENT_ALERT &&
       !(state.role == ui::AX_ROLE_ALERT ||
         state.role == ui::AX_ROLE_WINDOW)) {
     SendAlertControlNotification(view, type, profile);
     return;
   }
 
@@ skipping 369 matching lines @@
     return base::UTF16ToUTF8(state.name);
 
   for (int i = 0; i < view->child_count(); ++i) {
     views::View* child = view->child_at(i);
     std::string result = RecursiveGetStaticText(child);
     if (!result.empty())
       return result;
   }
   return std::string();
 }