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;
+using views::ViewStorage;
 
 AccessibilityEventRouterViews::AccessibilityEventRouterViews()
-    : most_recent_profile_(NULL) {
+    : most_recent_profile_(NULL),
+      most_recent_view_id_(
+          ViewStorage::GetInstance()->CreateStorageID()) {
   // 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 21 matching lines @@
     // we pass more information along to the listener such as focused state.
     if (!view->GetFocusManager() ||
         view->GetFocusManager()->GetFocusedView() != view)
       return;
   }
 
   // Don't dispatch the accessibility event until the next time through the
   // event loop, to handle cases where the view's state changes after
   // the call to post the event. It's safe to use base::Unretained(this)
   // because AccessibilityEventRouterViews is a singleton.
-  views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
+  ViewStorage* view_storage = ViewStorage::GetInstance();
   int view_storage_id = view_storage->CreateStorageID();
   view_storage->StoreView(view_storage_id, view);
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(
           &AccessibilityEventRouterViews::DispatchEventOnViewStorageId,
           view_storage_id,
           event_type));
 }
 
@@ skipping 31 matching lines @@
     most_recent_profile_ = NULL;
 }
 
 //
 // Private methods
 //
 
 void AccessibilityEventRouterViews::DispatchEventOnViewStorageId(
     int view_storage_id,
     ui::AXEvent type) {
-  views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
+  ViewStorage* view_storage = ViewStorage::GetInstance();
   views::View* view = view_storage->RetrieveView(view_storage_id);
   view_storage->RemoveView(view_storage_id);
   if (!view)
     return;
 
   AccessibilityEventRouterViews* instance =
       AccessibilityEventRouterViews::GetInstance();
   instance->DispatchAccessibilityEvent(view, type);
 }
 
@@ skipping 22 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;
   }
 
+  view = FindFirstAccessibleAncestor(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 &&
+      ViewStorage::GetInstance()->RetrieveView(most_recent_view_id_) == view) {
+    return;
+  }
+  // If there was already a view stored here from before, it must be removed
+  // before storing a new view.
+  ViewStorage::GetInstance()->RemoveView(most_recent_view_id_);
+  ViewStorage::GetInstance()->StoreView(most_recent_view_id_, 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();
 }
+
+// static
+views::View* AccessibilityEventRouterViews::FindFirstAccessibleAncestor(
+    views::View* view) {
+  while (view->parent() && !view->IsAccessibilityFocusable()) {
+    view = view->parent();
+  }
+  return view;
+}