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

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 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/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 323 matching lines @@
         SkIntToScalar(1), SkIntToScalar(height() - 1) };
     canvas->drawRect(rc_down, paint_down);
   }
 
   virtual gfx::Size GetPreferredSize() {
     // We get the full height of the bookmark bar, so that the height returned
     // here doesn't matter.
     return gfx::Size(kSeparatorWidth, 1);
   }
 
+  virtual bool GetAccessibleName(std::wstring* name) {

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

Nit: DCHECK(name)

+    if (!accessible_name_.empty()) {
+      (*name).assign(accessible_name_);

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

Nit: name-> instead of (*name).

+      return true;
+    }
+    return false;
+  }
+
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role) {
+    DCHECK(role);
+
+    *role = AccessibilityTypes::ROLE_SEPARATOR;
+    return true;
+  }
+
+  virtual void SetAccessibleName(const std::wstring& name) {
+    accessible_name_.assign(name);
+  }
+
  private:
+  // Storage of strings needed for accessibility.
+  std::wstring accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView);
 };
 
 // BookmarkBarView ------------------------------------------------------------
 
 // static
 const int BookmarkBarView::kMaxButtonWidth = 150;
 
 // static
 bool BookmarkBarView::testing_ = false;
@@ skipping 440 matching lines @@
   const BookmarkNode* parent_node;
   if (is_over_other) {
     parent_node = root;
     index = parent_node->GetChildCount();
   } else if (drop_on) {
     parent_node = root->GetChild(index);
     index = parent_node->GetChildCount();
   } else {
     parent_node = root;
   }
-  return bookmark_utils::PerformBookmarkDrop(profile_, data, parent_node, index);
+  return bookmark_utils::PerformBookmarkDrop(profile_, data, parent_node,
+                                             index);
+}
+
+bool BookmarkBarView::GetAccessibleName(std::wstring* name) {
+  if (!accessible_name_.empty()) {
+    (*name).assign(accessible_name_);

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

Same nits as above: CHECK(name) and name->

+    return true;
+  }
+  return false;
+}
+
+bool BookmarkBarView::GetAccessibleRole(AccessibilityTypes::Role* role) {
+  DCHECK(role);
+
+  *role = AccessibilityTypes::ROLE_TOOLBAR;
+  return true;
+}
+
+void BookmarkBarView::SetAccessibleName(const std::wstring& name) {
+  accessible_name_.assign(name);
 }
 
 void BookmarkBarView::OnFullscreenToggled(bool fullscreen) {
   if (!fullscreen)
     size_animation_->Reset(IsAlwaysShown() ? 1 : 0);
   else if (IsAlwaysShown())
     size_animation_->Reset(0);
 }
 
 bool BookmarkBarView::IsDetachedStyle() {
@@ skipping 56 matching lines @@
   if (!kDefaultFavIcon)
     kDefaultFavIcon = rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
 
   other_bookmarked_button_ = CreateOtherBookmarkedButton();
   AddChildView(other_bookmarked_button_);
 
   overflow_button_ = CreateOverflowButton();
   AddChildView(overflow_button_);
 
   bookmarks_separator_view_ = new ButtonSeparatorView();
+  bookmarks_separator_view_->SetAccessibleName(
+      l10n_util::GetString(IDS_ACCNAME_SEPARATOR));
   AddChildView(bookmarks_separator_view_);
 
   instructions_ = new views::Label(
       l10n_util::GetString(IDS_BOOKMARKS_NO_ITEMS),
       rb.GetFont(ResourceBundle::BaseFont));
   instructions_->SetColor(kInstructionsColor);
   AddChildView(instructions_);
 
   SetContextMenuController(this);
 
   size_animation_.reset(new SlideAnimation(this));
 }
 
 MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
   MenuButton* button = new BookmarkFolderButton(
       this, l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_BOOKMARKED), this,
       false);
   button->SetIcon(GetGroupIcon());
   button->SetContextMenuController(this);
   button->set_tag(kOtherFolderButtonTag);
+  button->SetAccessibleName(
+      l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_BOOKMARKED));
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateOverflowButton() {
   MenuButton* button = new MenuButton(NULL, std::wstring(), this, false);
   button->SetIcon(*ResourceBundle::GetSharedInstance().
                   GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   // The overflow button's image contains an arrow and therefore it is a
   // direction sensitive image and we need to flip it if the UI layout is
   // right-to-left.
   //
   // By default, menu buttons are not flipped because they generally contain
   // text and flipping the gfx::Canvas object will break text rendering. Since
   // the overflow button does not contain text, we can safely flip it.
   button->EnableCanvasFlippingForRTLUI(true);
 
   // Make visible as necessary.
   button->SetVisible(false);
+  // Set accessibility name.
+  button->SetAccessibleName(
+      l10n_util::GetString(IDS_ACCNAME_BOOKMARKS_CHEVRON));
   return button;
 }
 
 int BookmarkBarView::GetBookmarkButtonCount() {
   // We contain at least four non-bookmark button views: recently bookmarked,
   // bookmarks separator, chevrons (for overflow), the instruction
   // label.
   return GetChildViewCount() - 4;
 }
 
@@ skipping 325 matching lines @@
         new BookmarkFolderButton(this, node->GetTitle(), this, false);
     button->SetIcon(GetGroupIcon());
     ConfigureButton(node, button);
     return button;
   }
 }
 
 void BookmarkBarView::ConfigureButton(const BookmarkNode* node,
                                       views::TextButton* button) {
   button->SetText(node->GetTitle());
+  button->SetAccessibleName(node->GetTitle());
 
   // We don't always have a theme provider (ui tests, for example).
   if (GetThemeProvider()) {
     button->SetEnabledColor(GetThemeProvider()->GetColor(
         BrowserThemeProvider::COLOR_BOOKMARK_TEXT));
   }
 
   button->ClearMaxTextSize();
   button->SetContextMenuController(this);
   button->SetDragController(this);
@@ skipping 229 matching lines @@
     } else {
       return DragDropTypes::DRAG_NONE;
     }
   }
 
   if (*drop_on) {
     const BookmarkNode* parent =
         *is_over_other ? model_->other_node() :
                          model_->GetBookmarkBarNode()->GetChild(*index);
     int operation =
-        bookmark_utils::BookmarkDropOperation(profile_,event, data, parent,
+        bookmark_utils::BookmarkDropOperation(profile_, event, data, parent,
                                               parent->GetChildCount());
     if (!operation && !data.has_single_url() &&
         data.GetFirstNode(profile_) == parent) {
       // Don't open a menu if the node being dragged is the the menu to
       // open.
       *drop_on = false;
     }
     return operation;
   }
   return bookmark_utils::BookmarkDropOperation(profile_, event, data,
@@ skipping 47 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }