Allow Extensions to have MSAA information

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2010 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/views/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
+#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/detachable_toolbar_view.h"
 #include "chrome/browser/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "grit/app_resources.h"
+#include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/drag_utils.h"
 #include "views/window/window.h"
 
 #include "grit/theme_resources.h"
 
@@ skipping 113 matching lines @@
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
   SkBitmap image = browser_action()->GetIcon(tab_id);
   if (!image.isNull())
     SetIcon(image);
   else if (!default_icon_.isNull())
     SetIcon(default_icon_);
 
-  SetTooltipText(UTF8ToWide(browser_action()->GetTitle(tab_id)));
+  // If the browser action name is empty, show the extension name instead.
+  std::wstring name = UTF8ToWide(browser_action()->GetTitle(tab_id));
+  if (name.empty())
+    name = UTF8ToWide(extension()->name());
+  SetTooltipText(name);
+  SetAccessibleName(name);
   GetParent()->SchedulePaint();
 }
 
 void BrowserActionButton::Observe(NotificationType type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
   if (type == NotificationType::EXTENSION_BROWSER_ACTION_UPDATED) {
     UpdateState();
     // The browser action may have become visible/hidden so we need to make
     // sure the state gets updated.
@@ skipping 120 matching lines @@
 
   if (tab_id >= 0) {
     gfx::Rect bounds =
         gfx::Rect(icon.width(), icon.height() + kControlVertOffset);
     button_->extension()->browser_action()->PaintBadge(canvas, bounds, tab_id);
   }
 
   return canvas;
 }
 
+bool BrowserActionView::GetAccessibleRole(AccessibilityTypes::Role* role) {
+  DCHECK(role);

[M-A Ruel, 2010/03/23 00:36:01]

drive-by:
you should have removed the DCHECK and set the return value to void. There's
nothing the caller can do on the return value and the DCHECK doesn't add
anything.

+  *role = AccessibilityTypes::ROLE_GROUPING;

[tfarina (gmail-do not use), 2010/03/20 19:47:21]

nit: could you add the following lines?
if (!role)
  return false;

+  return true;
+}
+
+bool BrowserActionView::GetAccessibleName(std::wstring* name) {

[M-A Ruel, 2010/03/23 00:36:01]

Same.

+  DCHECK(name);
+  *name = l10n_util::GetString(IDS_ACCNAME_EXTENSIONS_BROWSER_ACTION);

[tfarina (gmail-do not use), 2010/03/20 19:47:21]

nit: could you add the following lines?

if (!name)
  return false;

+  return true;
+}
+
 void BrowserActionView::Layout() {
   button_->SetBounds(0, kControlVertOffset, width(), kButtonSize);
 }
 
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   ExtensionAction* action = button()->browser_action();
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
@@ skipping 25 matching lines @@
 
   ExtensionsService* extension_service = profile_->GetExtensionsService();
   if (!extension_service)  // The |extension_service| can be NULL in Incognito.
     return;
 
   model_ = extension_service->toolbar_model();
   model_->AddObserver(this);
 
   resize_animation_.reset(new SlideAnimation(this));
   resize_gripper_ = new views::ResizeGripper(this);
+  resize_gripper_->SetAccessibleName(
+      l10n_util::GetString(IDS_ACCNAME_SEPARATOR));
   resize_gripper_->SetVisible(false);
   AddChildView(resize_gripper_);
 
   // TODO(glen): Come up with a new bitmap for the chevron.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SkBitmap* chevron_image = rb.GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS);
   chevron_ = new views::MenuButton(NULL, std::wstring(), this, false);
   chevron_->SetVisible(false);
   chevron_->SetIcon(*chevron_image);
+  chevron_->SetAccessibleName(
+      l10n_util::GetString(IDS_ACCNAME_EXTENSIONS_CHEVRON));
   // Chevron contains >> that should point left in LTR locales.
   chevron_->EnableCanvasFlippingForRTLUI(true);
   AddChildView(chevron_);
 
   int predefined_width =
       profile_->GetPrefs()->GetInteger(prefs::kBrowserActionContainerWidth);
   if (predefined_width == 0) {
     // The width will never be 0 (due to container min size restriction)
     // except when no width has been saved. So, in that case ask the model
     // how many icons we'll show and set initial size to that.
@@ skipping 405 matching lines @@
 
   if (profile_->IsOffTheRecord())
     i = model_->IncognitoIndexToOriginal(i);
 
   model_->MoveBrowserAction(dragging, i);
 
   OnDragExited();  // Perform clean up after dragging.
   return DragDropTypes::DRAG_MOVE;
 }
 
+bool BrowserActionsContainer::GetAccessibleRole(
+    AccessibilityTypes::Role* role) {
+  DCHECK(role);
+  *role = AccessibilityTypes::ROLE_GROUPING;

[tfarina (gmail-do not use), 2010/03/20 19:47:21]

nit: could you add the following lines?
if (!role)
  return false;

+  return true;
+}
+
+bool BrowserActionsContainer::GetAccessibleName(std::wstring* name) {
+  DCHECK(name);
+  *name = l10n_util::GetString(IDS_ACCNAME_EXTENSIONS);

[tfarina (gmail-do not use), 2010/03/20 19:47:21]

nit: could you add the following lines?
if (!name)
  return false;

+  return !name->empty();
+}
+
 void BrowserActionsContainer::MoveBrowserAction(
     const std::string& extension_id, size_t new_index) {
   ExtensionsService* service = profile_->GetExtensionsService();
   Extension* extension = service->GetExtensionById(extension_id, false);
   model_->MoveBrowserAction(extension, new_index);
   SchedulePaint();
 }
 
 void BrowserActionsContainer::RunMenu(View* source, const gfx::Point& pt) {
   if (source == chevron_) {
@@ skipping 292 matching lines @@
   popup_ = NULL;
   popup_button_->SetButtonNotPushed();
   popup_button_ = NULL;
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionsService()->IsIncognitoEnabled(extension));
 }