Collapse bookmark bars into a single bar per window, rather than one per tab.

Create a separate controller for the bar. Hide bar when it's not supposed to be
visible instead of just allowing it to be covered by content (it's not always
covered, which leads to drawing errors).

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13661 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 14 deletions

diff --git a/chrome/browser/cocoa/tab_strip_controller.h b/chrome/browser/cocoa/tab_strip_controller.h
index dae7218..faa7132 100644
--- a/chrome/browser/cocoa/tab_strip_controller.h
+++ b/chrome/browser/cocoa/tab_strip_controller.h
@@ -12,11 +12,8 @@
 #import "chrome/browser/cocoa/tab_controller_target.h"
 
 @class TabStripView;
-@class BookmarkBarStateController;
 
-class BookmarkModel;
 class Browser;
-class LocationBar;
 class TabStripModelObserverBridge;
 class TabStripModel;
 class TabContents;
@@ -41,7 +38,6 @@ class ToolbarModel;
   NSButton* newTabButton_;  // weak, obtained from the nib.
   scoped_ptr<TabStripModelObserverBridge> bridge_;
   TabStripModel* tabModel_;  // weak
-  BookmarkModel* bookmarkModel_;  // weak, one per profile (= one per Browser*)
   // access to the TabContentsControllers (which own the parent view
   // for the toolbar and associated tab contents) given an index. This needs
   // to be kept in the same order as the tab strip's model as we will be
@@ -50,9 +46,6 @@ class ToolbarModel;
   // an array of TabControllers which manage the actual tab views. As above,
   // this is kept in the same order as the tab strip model.
   scoped_nsobject<NSMutableArray> tabArray_;
-
-  // Controller for bookmark bar state, shared among all TabContents.
-  scoped_nsobject<BookmarkBarStateController> bookmarkBarStateController_;
 }
 
 // Initialize the controller with a view and browser that contains
@@ -68,13 +61,6 @@ class ToolbarModel;
 // in the coordinate system of the content area of the currently selected tab.
 - (NSRect)selectedTabGrowBoxRect;
 
-// Return a boolean (ObjC BOOL, not C++ bool) to say if the bookmark
-// bar is visible.
-- (BOOL)isBookmarkBarVisible;
-
-// Turn on or off the bookmark bar for *ALL* tabs.
-- (void)toggleBookmarkBar;
-
 // Given a tab view in the strip, return its index. Returns -1 if not present.
 - (NSInteger)indexForTabView:(NSView*)view;