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, 1 insertions, 17 deletions

diff --git a/chrome/browser/cocoa/tab_contents_controller.h b/chrome/browser/cocoa/tab_contents_controller.h
index f4098ed..2714ab9 100644
--- a/chrome/browser/cocoa/tab_contents_controller.h
+++ b/chrome/browser/cocoa/tab_contents_controller.h
@@ -7,14 +7,11 @@
 
 #include <Cocoa/Cocoa.h>
 
-@class BookmarkView;
 @class GrowBoxView;
 
-class BookmarkModel;
 class TabContents;
 class TabContentsCommandObserver;
 class TabStripModel;
-@class ToolbarView;
 
 // A class that controls the web contents of a tab. It manages displaying the
 // native view for a given TabContents in |contentsBox_|.
@@ -24,24 +21,14 @@ class TabStripModel;
   TabContentsCommandObserver* observer_;  // nil if |commands_| is nil
   TabContents* contents_;  // weak
 
-  BookmarkModel* bookmarkModel_;  // weak; one per window
-
-  // TODO(jrg): write a BookmarkView
-  IBOutlet ToolbarView* /* BookmarkView* */ bookmarkView_;
-
   IBOutlet NSBox* contentsBox_;
   IBOutlet GrowBoxView* growBox_;
-
-  // The contents box will have an offset if shrunk to make room for
-  // the bookmark bar.
-  BOOL contentsBoxHasOffset_;
 }
 
 // Create the contents of a tab represented by |contents| and loaded from the
 // nib given by |name|.
 - (id)initWithNibName:(NSString*)name
-             contents:(TabContents*)contents
-        bookmarkModel:(BookmarkModel*)bookmarkModel;
+             contents:(TabContents*)contents;
 
 // Take this view (toolbar and web contents) full screen
 - (IBAction)fullScreen:(id)sender;
@@ -60,9 +47,6 @@ class TabStripModel;
 // in the coordinate system of the content area of this tab.
 - (NSRect)growBoxRect;
 
-// Change the visibility state of the bookmark bar.
-- (void)toggleBookmarkBar:(BOOL)enable;
-
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TAB_COTNENTS_CONTROLLER_H_