From 6420421e6f15f25891c88661431ce9483ccfdba7 Mon Sep 17 00:00:00 2001 From: "pinkerton@chromium.org" Date: Tue, 14 Apr 2009 15:23:39 +0000 Subject: 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 --- chrome/browser/cocoa/tab_strip_controller.mm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'chrome/browser/cocoa/tab_strip_controller.mm') diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm index 0fca35f..920438c 100644 --- a/chrome/browser/cocoa/tab_strip_controller.mm +++ b/chrome/browser/cocoa/tab_strip_controller.mm @@ -7,7 +7,6 @@ #import "base/sys_string_conversions.h" #import "chrome/app/chrome_dll_resource.h" #import "chrome/browser/browser.h" -#import "chrome/browser/cocoa/bookmark_bar_state_controller.h" #import "chrome/browser/cocoa/tab_strip_view.h" #import "chrome/browser/cocoa/tab_cell.h" #import "chrome/browser/cocoa/tab_contents_controller.h" @@ -27,12 +26,9 @@ tabView_ = view; switchView_ = switchView; tabModel_ = browser->tabstrip_model(); - bookmarkModel_ = browser->profile()->GetBookmarkModel(); bridge_.reset(new TabStripModelObserverBridge(tabModel_, self)); tabContentsArray_.reset([[NSMutableArray alloc] init]); tabArray_.reset([[NSMutableArray alloc] init]); - bookmarkBarStateController_.reset([[BookmarkBarStateController alloc] - initWithBrowser:browser]); // Take the only child view present in the nib as the new tab button. For // some reason, if the view is present in the nib apriori, it draws // correctly. If we create it in code and add it to the tab view, it draws @@ -212,11 +208,8 @@ // the new controller with |contents| so it can be looked up later. TabContentsController* contentsController = [[[TabContentsController alloc] initWithNibName:@"TabContents" - contents:contents - bookmarkModel:bookmarkModel_] + contents:contents] autorelease]; - if ([self isBookmarkBarVisible]) - [contentsController toggleBookmarkBar:YES]; [tabContentsArray_ insertObject:contentsController atIndex:index]; // Make a new tab and add it to the strip. Keep track of its controller. @@ -319,17 +312,4 @@ return [selectedController growBoxRect]; } -- (BOOL)isBookmarkBarVisible { - return [bookmarkBarStateController_ visible]; -} - -// Called from BrowserWindowController -- (void)toggleBookmarkBar { - [bookmarkBarStateController_ toggleBookmarkBar]; - BOOL visible = [self isBookmarkBarVisible]; - for (TabContentsController *controller in tabContentsArray_.get()) { - [controller toggleBookmarkBar:visible]; - } -} - @end -- cgit v1.1