Adds MSAA information to various (previously uncovered) bits of the UI, inclu...

chrome/browser/views/extensions/extension_shelf.cc

 // Copyright (c) 2009 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/extensions/extension_shelf.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
@@ skipping 547 matching lines @@
   }
   SchedulePaint();
 }
 
 void ExtensionShelf::OnMouseEntered(const views::MouseEvent& event) {
 }
 
 void ExtensionShelf::OnMouseExited(const views::MouseEvent& event) {
 }
 
-void ExtensionShelf::ToolstripInsertedAt(ExtensionHost* host,
-                                         int index) {
+bool ExtensionShelf::GetAccessibleRole(AccessibilityTypes::Role* role) {
+  DCHECK(role);
+
+  *role = AccessibilityTypes::ROLE_TOOLBAR;
+  return true;
+}
+
+bool ExtensionShelf::GetAccessibleName(std::wstring* name) {
+  if (!accessible_name_.empty()) {

[jcampan, 2009/07/14 16:44:24]

Same nit as previously: DCHECK(name), name->assign

+    (*name).assign(accessible_name_);
+    return true;
+  }
+  return false;
+}
+
+void ExtensionShelf::SetAccessibleName(const std::wstring& name) {
+  accessible_name_.assign(name);
+}
+
+void ExtensionShelf::ToolstripInsertedAt(ExtensionHost* host, int index) {
   model_->SetToolstripDataAt(index, new Toolstrip(this, host));
 
   bool had_views = GetChildViewCount() > 0;
   ExtensionView* view = host->view();
   if (!background_.empty())
     view->SetBackground(background_);
   AddChildView(view);
   view->SetContainer(this);
   if (!had_views)
     PreferredSizeChanged();
   Layout();
 }
 
-void ExtensionShelf::ToolstripRemovingAt(ExtensionHost* host,
-                                         int index) {
+void ExtensionShelf::ToolstripRemovingAt(ExtensionHost* host, int index) {
   // Delete the Toolstrip view and remove it from the model.
   Toolstrip* toolstrip = ToolstripAtIndex(index);
   View* view = toolstrip->GetShelfView();
   RemoveChildView(view);
   delete toolstrip;
   model_->SetToolstripDataAt(index, NULL);
 
   // Technically, the toolstrip is still in the model at this point, but
   // the Layout code handles this case.
   Layout();
 }
 
-void ExtensionShelf::ToolstripDraggingFrom(ExtensionHost* host,
-                                           int index) {
+void ExtensionShelf::ToolstripDraggingFrom(ExtensionHost* host, int index) {
 }
 
-void ExtensionShelf::ToolstripMoved(ExtensionHost* host,
-                                    int from_index,
+void ExtensionShelf::ToolstripMoved(ExtensionHost* host, int from_index,
                                     int to_index) {
   Layout();
 }
 
-void ExtensionShelf::ToolstripChangedAt(ExtensionHost* toolstrip,
-                                        int index) {
+void ExtensionShelf::ToolstripChangedAt(ExtensionHost* toolstrip, int index) {
 }
 
 void ExtensionShelf::ExtensionShelfEmpty() {
   PreferredSizeChanged();
 }
 
 void ExtensionShelf::ShelfModelReloaded() {
   // None of the child views are parent owned, so nothing is being leaked here.
   RemoveAllChildViews(false);
   LoadFromModel();
 }
 
 void ExtensionShelf::OnExtensionMouseEvent(ExtensionView* view) {
   Toolstrip *toolstrip = ToolstripForView(view);
   if (toolstrip)
     toolstrip->ShowShelfHandle();
 }
 
 void ExtensionShelf::OnExtensionMouseLeave(ExtensionView* view) {
   Toolstrip *toolstrip = ToolstripForView(view);
   if (toolstrip)
     toolstrip->HideShelfHandle(kHideDelayMs);
 }
 
-void ExtensionShelf::DropExtension(Toolstrip* toolstrip,
-                                   const gfx::Point& pt, bool cancel) {
+void ExtensionShelf::DropExtension(Toolstrip* toolstrip, const gfx::Point& pt,
+                                   bool cancel) {
   Toolstrip* dest_toolstrip = ToolstripAtX(pt.x());
   if (!dest_toolstrip) {
     if (pt.x() > 0)
       dest_toolstrip = ToolstripAtIndex(model_->count() - 1);
     else
       dest_toolstrip = ToolstripAtIndex(0);
   }
   if (toolstrip == dest_toolstrip)
     return;
   int from = model_->IndexOfToolstrip(toolstrip->host());
   int to = model_->IndexOfToolstrip(dest_toolstrip->host());
   DCHECK(from != to);
   model_->MoveToolstripAt(from, to);
 }
 
-void ExtensionShelf::InitBackground(gfx::Canvas* canvas,
-                                    const SkRect& subset) {
+void ExtensionShelf::InitBackground(gfx::Canvas* canvas, const SkRect& subset) {
   if (!background_.empty())
     return;
 
   const SkBitmap& background = canvas->getDevice()->accessBitmap(false);
 
   // Extract the correct subset of the toolstrip background into a bitmap. We
   // must use a temporary here because extractSubset() returns a bitmap that
   // references pixels in the original one and we want to actually make a copy
   // that will have a long lifetime.
   SkBitmap temp;
@@ skipping 53 matching lines @@
   }
   NOTREACHED();
   return NULL;
 }
 
 void ExtensionShelf::LoadFromModel() {
   int count = model_->count();
   for (int i = 0; i < count; ++i)
     ToolstripInsertedAt(model_->ToolstripAt(i), i);
 }