Initial cut at scaffolding for mac sidetabs. No visible changes to browser wi...

chrome/browser/cocoa/toolbar_controller.h

 // Copyright (c) 2010 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_TOOLBAR_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
@@ skipping 26 matching lines @@
 class TabContents;
 class ToolbarModel;
 
 // A controller for the toolbar in the browser window. Manages
 // updating the state for location bar and back/fwd/reload/go buttons.
 // Manages the bookmark bar and its position in the window relative to
 // the web content view.
 
 @interface ToolbarController : NSViewController<CommandObserverProtocol,
                                                 URLDropTargetController> {
+ @protected
+  // The ordering is important for unit tests. If new items are added or the
+  // ordering is changed, make sure to update |-toolbarViews| and the
+  // corresponding enum in the unit tests.
+  IBOutlet DelayedMenuButton* backButton_;
+  IBOutlet DelayedMenuButton* forwardButton_;
+  IBOutlet NSButton* reloadButton_;
+  IBOutlet NSButton* homeButton_;
+  IBOutlet NSButton* goButton_;
+  IBOutlet MenuButton* pageButton_;
+  IBOutlet MenuButton* wrenchButton_;
+  IBOutlet AutocompleteTextField* locationBar_;
+  IBOutlet BrowserActionsContainerView* browserActionsContainerView_;
+
  @private
   ToolbarModel* toolbarModel_;  // weak, one per window
   CommandUpdater* commands_;  // weak, one per window
   Profile* profile_;  // weak, one per window
   Browser* browser_;  // weak, one per window
   scoped_ptr<CommandObserverBridge> commandObserver_;
   scoped_ptr<LocationBarViewMac> locationBarView_;
   scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;
   id<ViewResizer> resizeDelegate_;  // weak
   scoped_nsobject<BackForwardMenuController> backMenuController_;
@@ skipping 24 matching lines @@
 
   // Tracking area for mouse enter/exit/moved in the toolbar.
   scoped_nsobject<NSTrackingArea> trackingArea_;
 
   // We retain/release the hover button since interaction with the
   // button may make it go away (e.g. delete menu option over a
   // bookmark button).  Thus this variable is not weak.  The
   // hoveredButton_ is required to have an NSCell that responds to
   // setMouseInside:animate:.
   NSButton* hoveredButton_;
-
-  // The ordering is important for unit tests. If new items are added or the
-  // ordering is changed, make sure to update |-toolbarViews| and the
-  // corresponding enum in the unit tests.
-  IBOutlet DelayedMenuButton* backButton_;
-  IBOutlet DelayedMenuButton* forwardButton_;
-  IBOutlet NSButton* reloadButton_;
-  IBOutlet NSButton* homeButton_;
-  IBOutlet NSButton* goButton_;
-  IBOutlet MenuButton* pageButton_;
-  IBOutlet MenuButton* wrenchButton_;
-  IBOutlet AutocompleteTextField* locationBar_;
-  IBOutlet BrowserActionsContainerView* browserActionsContainerView_;
 }
 
 // Initialize the toolbar and register for command updates. The profile is
 // needed for initializing the location bar. The browser is needed for
 // initializing the back/forward menus.
 - (id)initWithModel:(ToolbarModel*)model
            commands:(CommandUpdater*)commands
             profile:(Profile*)profile
             browser:(Browser*)browser
      resizeDelegate:(id<ViewResizer>)resizeDelegate;
@@ skipping 41 matching lines @@
 // |ToolbarView| (0 means don't show it); no-op otherwise.
 - (void)setDividerOpacity:(CGFloat)opacity;
 
 // Create and add the Browser Action buttons to the toolbar view.
 - (void)createBrowserActionButtons;
 
 // Return the BrowserActionsController for this toolbar.
 - (BrowserActionsController*)browserActionsController;
 @end
 
+// A set of private methods used by subclasses. Do not call these directly
+// unless a subclass of ToolbarController.
+@interface ToolbarController(ProtectedMethods)
+// Designated initializer which takes a nib name in order to allow subclasses
+// to load a different nib file.
+- (id)initWithModel:(ToolbarModel*)model
+           commands:(CommandUpdater*)commands
+            profile:(Profile*)profile
+            browser:(Browser*)browser
+     resizeDelegate:(id<ViewResizer>)resizeDelegate
+       nibFileNamed:(NSString*)nibName;
+@end
+
 // A set of private methods used by tests, in the absence of "friends" in ObjC.
 @interface ToolbarController(PrivateTestMethods)
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews;
 - (void)showOptionalHomeButton;
 - (void)showOptionalPageWrenchButtons;
 // Return a hover button for the current event.
 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_