| Index: chrome/browser/cocoa/toolbar_controller.h | 
| =================================================================== | 
| --- chrome/browser/cocoa/toolbar_controller.h	(revision 22499) | 
| +++ chrome/browser/cocoa/toolbar_controller.h	(working copy) | 
| @@ -11,6 +11,7 @@ | 
| #include "base/scoped_nsobject.h" | 
| #import "chrome/browser/cocoa/command_observer_bridge.h" | 
| #import "chrome/browser/cocoa/bookmark_bar_controller.h" | 
| +#import "chrome/browser/cocoa/view_resizer.h" | 
| #include "chrome/common/pref_member.h" | 
|  | 
| @class AutocompleteTextField; | 
| @@ -31,7 +32,8 @@ | 
| // Manages the bookmark bar and it's position in the window relative to | 
| // the web content view. | 
|  | 
| -@interface ToolbarController : NSViewController<CommandObserverProtocol> { | 
| +@interface ToolbarController : | 
| +    NSViewController<CommandObserverProtocol, ViewResizer> { | 
| @private | 
| ToolbarModel* toolbarModel_;  // weak, one per window | 
| CommandUpdater* commands_;  // weak, one per window | 
| @@ -40,9 +42,8 @@ | 
| scoped_ptr<LocationBarViewMac> locationBarView_; | 
| scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_; | 
| scoped_nsobject<BookmarkBarController> bookmarkBarController_; | 
| +  id<ViewResizer> resizeDelegate_;  // weak | 
| id<BookmarkURLOpener> bookmarkBarDelegate_;  // weak | 
| -  NSView* webContentView_;  // weak; where the web goes | 
| -  NSView* infoBarsView_;     // weak; where the infobars go | 
|  | 
| // Used for monitoring the optional toolbar button prefs. | 
| scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; | 
| @@ -72,8 +73,7 @@ | 
| - (id)initWithModel:(ToolbarModel*)model | 
| commands:(CommandUpdater*)commands | 
| profile:(Profile*)profile | 
| -     webContentView:(NSView*)webContentView | 
| -       infoBarsView:(NSView*)infoBarsView | 
| +     resizeDelegate:(id<ViewResizer>)resizeDelegate | 
| bookmarkDelegate:(id<BookmarkURLOpener>)delegate; | 
|  | 
| // Get the C++ bridge object representing the location bar for this tab. | 
|  |