ExtensionShelf now uses the BookmarkExtensionBackground, just like the Bookma...

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"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/views/bookmark_menu_controller_views.h"
+#include "chrome/browser/views/detachable_toolbar_view.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 class Browser;
 class PageNavigator;
 class PrefService;
 
 namespace views {
 class MenuItemView;
 }
 
 // BookmarkBarView renders the BookmarkModel.  Each starred entry on the
 // BookmarkBar is rendered as a MenuButton. An additional MenuButton aligned to
 // the right allows the user to quickly see recently starred entries.
 //
 // BookmarkBarView shows the bookmarks from a specific Profile. BookmarkBarView
 // waits until the HistoryService for the profile has been loaded before
 // creating the BookmarkModel.
-class BookmarkBarView : public views::View,
+class BookmarkBarView : public DetachableToolbarView,
 #ifdef CHROME_PERSONALIZATION
                         public ProfileSyncServiceObserver,
 #endif
                         public BookmarkModelObserver,
                         public views::ViewMenuDelegate,
                         public views::ButtonListener,
                         public NotificationObserver,
                         public views::ContextMenuController,
                         public views::DragController,
                         public AnimationDelegate,
@@ skipping 34 matching lines @@
   // Returns the current profile.
   Profile* GetProfile() { return profile_; }
 
   // Returns the current browser.
   Browser* browser() const { return browser_; }
 
   // Sets the PageNavigator that is used when the user selects an entry on
   // the bookmark bar.
   void SetPageNavigator(PageNavigator* navigator);
 
+  // DetachableToolbarView methods:
+  virtual bool IsDetached() const;
+  virtual bool IsOnTop() const;
+  virtual double GetAnimationValue() const {
+    return size_animation_->GetCurrentValue();
+  }
+
   // View methods:
   virtual gfx::Size GetPreferredSize();
   virtual gfx::Size GetMinimumSize();
   virtual void Layout();
   virtual void DidChangeBounds(const gfx::Rect& previous,
                                const gfx::Rect& current);
   virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
   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);
   virtual bool GetAccessibleName(std::wstring* name);
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual void SetAccessibleName(const std::wstring& name);
-  double GetSizeAnimationValue() const {
-      return size_animation_->GetCurrentValue();
-  }
 
 #ifdef CHROME_PERSONALIZATION
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
 #endif
 
   // Called when fullscreen mode toggles on or off; this affects our layout.
   void OnFullscreenToggled(bool fullscreen);
 
   // Sets the model change listener to listener.
@@ skipping 12 matching lines @@
   ModelChangedListener* GetModelChangedListener() {
     return model_changed_listener_;
   }
 
   // Returns the page navigator.
   PageNavigator* GetPageNavigator() { return page_navigator_; }
 
   // Returns the model.
   BookmarkModel* GetModel() { return model_; }
 
-  // Returns true if the bookmark bar is drawn detached from the toolbar.  This
-  // can only be true when OnNewTabPage() is true (see below).
-  bool IsDetachedStyle();
-
   // Returns true if the bookmarks bar preference is set to 'always show'.
-  bool IsAlwaysShown();
+  bool IsAlwaysShown() const;
 
   // True if we're on a page where the bookmarks bar is always visible.
-  bool OnNewTabPage();
+  bool OnNewTabPage() const;
 
   // How much we want the bookmark bar to overlap the toolbar.  If |return_max|
   // is true, we return the maximum overlap rather than the current overlap.
   int GetToolbarOverlap(bool return_max);
 
   // Whether or not we are animating.
   bool IsAnimating() { return size_animation_->IsAnimating(); }
 
   // SlideAnimationDelegate implementation.
   void AnimationProgressed(const Animation* animation);
@@ skipping 312 matching lines @@
   // 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_