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

chrome/browser/cocoa/browser_window_controller.h

Index: chrome/browser/cocoa/browser_window_controller.h
===================================================================
--- chrome/browser/cocoa/browser_window_controller.h	(revision 13420)
+++ chrome/browser/cocoa/browser_window_controller.h	(working copy)
@@ -11,6 +11,7 @@
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/cocoa/tab_window_controller.h"
+#import "chrome/browser/cocoa/toolbar_view.h"
 
 class Browser;
 class BrowserWindow;
@@ -21,11 +22,13 @@
 @class TabStripController;
 class TabStripModelObserverBridge;
 @class TabStripView;
+@class ToolbarController;
 
 @interface BrowserWindowController :
     TabWindowController<NSUserInterfaceValidations> {
  @private
   TabStripController* tabStripController_;
+  ToolbarController* toolbarController_;
   Browser* browser_;
   TabStripModelObserverBridge* tabObserver_;
   BrowserWindowCocoa* windowShim_;