Revert 32012-32017

chrome/browser/views/bookmark_bar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 
 #include "app/slide_animation.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
@@ skipping 53 matching lines @@
    public:
     virtual ~ModelChangedListener() {}
 
     // Invoked when the model changes. Should cancel the edit and close any
     // dialogs.
     virtual void ModelChanged() = 0;
   };
 
   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
   // recreates the models.
   void SetProfile(Profile* profile);
 
   // Returns the current profile.
   Profile* GetProfile() { return profile_; }
 
   // Returns the current browser.
@@ skipping 20 matching lines @@
   virtual void PaintChildren(gfx::Canvas* canvas);
   virtual bool GetDropFormats(
       int* formats,
       std::set<OSExchangeData::CustomFormat>* custom_formats);
   virtual bool AreDropTypesRequired();
   virtual bool CanDrop(const OSExchangeData& data);
   virtual void OnDragEntered(const views::DropTargetEvent& event);
   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();
 
   // Called when fullscreen mode toggles on or off; this affects our layout.
   void OnFullscreenToggled(bool fullscreen);
 
   // Sets the model change listener to listener.
   void SetModelChangedListener(ModelChangedListener* listener) {
     model_changed_listener_ = listener;
@@ skipping 350 matching lines @@
   GURL bubble_url_;
 
   // If the bookmark bubble is showing, this is the visible ancestor of the URL.
   // The visible ancestor is either the other_bookmarked_button_,
   // overflow_button_ or a button on the bar.
   views::CustomButton* throbbing_view_;
 
   // Background for extension toolstrips.
   SkBitmap toolstrip_background_;
 
+  // Storage of strings needed for accessibility.
+  std::wstring accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_