Flatten down to a single toolbar per window, significantly simplifying the ta...

chrome/browser/cocoa/tab_strip_controller.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_COCOA_TAB_STRIP_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TAB_STRIP_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/cocoa/tab_controller_target.h"
@@ skipping 18 matching lines @@
 // When a new tab is created, we create a TabController which manages loading
 // the contents, including toolbar, from a separate nib file. This controller
 // then handles replacing the contentView of the window. As tabs are switched,
 // the single child of the contentView is swapped around to hold the contents
 // (toolbar and all) representing that tab.
 
 @interface TabStripController : NSObject <TabControllerTarget> {
  @private
   TabContents* currentTab_;   // weak, tab for which we're showing state
   TabStripView* tabView_;  // weak
+  NSView* switchView_;  // weak
   NSButton* newTabButton_;  // weak, obtained from the nib.
   TabStripModelObserverBridge* bridge_;
   TabStripModel* tabModel_;  // weak
-  ToolbarModel* toolbarModel_;  // weak, one per browser
   BookmarkModel* bookmarkModel_;  // weak, one per profile (= one per Browser*)
   CommandUpdater* commands_;  // weak, may be nil
   // 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
   // using its index from the TabStripModelObserver calls.
   NSMutableArray* tabContentsArray_;
   // an array of TabControllers which manage the actual tab views. As above,
   // this is kept in the same order as the tab strip model.
   NSMutableArray* tabArray_;
 
   // Controller for bookmark bar state, shared among all TabContents.
   BookmarkBarStateController* bookmarkBarStateController_;
 }
 
 // Initialize the controller with a view and browser that contains
-// everything else we'll need.
+// everything else we'll need. |switchView| is the view whose contents get
+// "switched" every time the user switches tabs. The children of this view
+// will be released, so if you want them to stay around, make sure
+// you have retained them.
 - (id)initWithView:(TabStripView*)view
+        switchView:(NSView*)switchView
            browser:(Browser*)browser;
 
-// Get the C++ bridge object representing the location bar for the current tab.
-- (LocationBar*)locationBar;
-
-// Updates the toolbar (and transitively the location bar) with the states of
-// the specified |tab|.  If |shouldRestore| is true, we're switching
-// (back?) to this tab and should restore any previous location bar state
-// (such as user editing) as well.
-- (void)updateToolbarWithContents:(TabContents*)tab
-               shouldRestoreState:(BOOL)shouldRestore;
-
-// Sets whether or not the current page in the frontmost tab is bookmarked.
-- (void)setStarredState:(BOOL)isStarred;
-
 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
 // in the coordinate system of the content area of the currently selected tab.
 - (NSRect)selectedTabGrowBoxRect;
 
-// Called to tell the selected tab to update its loading state.
-- (void)setIsLoading:(BOOL)isLoading;
-
-// Make the location bar the first responder, if possible.
-- (void)focusLocationBar;
-
 // 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;
 
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TAB_STRIP_CONTROLLER_H_