a bunch of bookmark bar changes

chrome/browser/cocoa/browser_window_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_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
-// A class acting as the Objective-C controller for the Browser object. Handles
-// interactions between Cocoa and the cross-platform code. Each window has a
-// single set of toolbars (main toolbar, bookmark bar, etc) and, by virtue of
-// being a TabWindowController, a tab strip along the top.
+// A class acting as the Objective-C controller for the Browser
+// object. Handles interactions between Cocoa and the cross-platform
+// code. Each window has a single toolbar and, by virtue of being a
+// TabWindowController, a tab strip along the top.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/cocoa/tab_window_controller.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 
 class Browser;
 class BrowserWindow;
@@ skipping 19 matching lines @@
   // window so that it will live after the NSWindowController dealloc has run
   // (which happens *before* these scoped pointers are torn down). Keeping it
   // alive ensures that weak view or window pointers remain valid through
   // their destruction sequence.
   scoped_ptr<Browser> browser_;
   scoped_nsobject<NSWindow> window_;
   scoped_nsobject<NSWindow> fullscreen_window_;
   scoped_ptr<TabStripModelObserverBridge> tabObserver_;
   scoped_ptr<BrowserWindowCocoa> windowShim_;
   scoped_nsobject<ToolbarController> toolbarController_;
-  scoped_nsobject<BookmarkBarController> bookmarkBarController_;
   scoped_nsobject<TabStripController> tabStripController_;
   scoped_nsobject<FindBarCocoaController> findBarCocoaController_;
   scoped_ptr<StatusBubble> statusBubble_;
   scoped_nsobject<DownloadShelfController> downloadShelfController_;
   BOOL ownsBrowser_;  // Only ever NO when testing
   BOOL fullscreen_;
 }
 
 // Load the browser window nib and do any Cocoa-specific initialization.
 // Takes ownership of |browser|.
@@ skipping 67 matching lines @@
 
 // Allows us to initWithBrowser withOUT taking ownership of the browser.
 - (id)initWithBrowser:(Browser*)browser takeOwnership:(BOOL)ownIt;
 
 // Return an autoreleased NSWindow suitable for fullscreen use.
 - (NSWindow*)fullscreenWindow;
 
 @end  // BrowserWindowController(TestingAPI)
 
 #endif  // CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_