Revert 32012-32017

chrome/browser/views/bookmark_bar_view.h

Index: chrome/browser/views/bookmark_bar_view.h
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 1653ae20cfad4877c6eb6bcd463aedb0e011973d..49ac37fe2e4db1a8634bd95dd230fca989da6659 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -71,7 +71,7 @@ class BookmarkBarView : public DetachableToolbarView,
 
   static const int kNewtabBarHeight;
 
-  BookmarkBarView(Profile* profile, Browser* browser);
+  explicit BookmarkBarView(Profile* profile, Browser* browser);
   virtual ~BookmarkBarView();
 
   // Resets the profile. This removes any buttons for the current profile and
@@ -112,9 +112,9 @@ class BookmarkBarView : public DetachableToolbarView,
   virtual int OnDragUpdated(const views::DropTargetEvent& event);
   virtual void OnDragExited();
   virtual int OnPerformDrop(const views::DropTargetEvent& event);
-
-  // AccessibleToolbarView methods:
-  virtual bool IsAccessibleViewTraversable(views::View* view);
+  virtual bool GetAccessibleName(std::wstring* name);
+  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual void SetAccessibleName(const std::wstring& name);
 
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
@@ -485,6 +485,9 @@ class BookmarkBarView : public DetachableToolbarView,
   // Background for extension toolstrips.
   SkBitmap toolstrip_background_;
 
+  // Storage of strings needed for accessibility.
+  std::wstring accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };