Rewrites the Mac view resizing logic to have the BrowserWindowController

directly resize and relayout its children views.  Now when a view needs
to be resized, it asks its resize delegate (typically its controller's
parent) to perform the resize.

BUG=http://crbug.com/17619

TEST=Make sure that views are laid out correctly, even when they change size.
Open and close the bookmark bar.  Trigger an infobar and then close it.  Trigger
the download shelf and then close it.  Trigger a download shelf with the infobar
open, or with the bookmark bar open.  Switch to and from fullscreen with various
bars open.  Resize the browser window with various bars open.  Start the browser
with and without the bookmark bar open.  Try all of the above in a popup window.

Review URL: http://codereview.chromium.org/159776

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22517 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 9 deletions

diff --git a/chrome/browser/cocoa/download_shelf_controller.h b/chrome/browser/cocoa/download_shelf_controller.h
index c72538a..9ace0d3 100644
--- a/chrome/browser/cocoa/download_shelf_controller.h
+++ b/chrome/browser/cocoa/download_shelf_controller.h
@@ -6,6 +6,7 @@
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
+#import "chrome/browser/cocoa/view_resizer.h"
 
 class BaseDownloadItemModel;
 class Browser;
@@ -38,14 +39,9 @@ class DownloadShelf;
 
   IBOutlet NSImageView* image_;
 
-  // Currently these two are always the same, but they mean slightly different
-  // things. |contentAreaHasOffset_| is an implementation detail of the download
-  // shelf visibility.
-  BOOL contentAreaHasOffset_;
   BOOL barIsVisible_;
 
   scoped_ptr<DownloadShelf> bridge_;
-  NSView* contentArea_;  // the browser's content area
   float shelfHeight_;
 
   // The download items we have added to our shelf.
@@ -53,9 +49,13 @@ class DownloadShelf;
 
   // The container that contains (and clamps) all the download items.
   IBOutlet NSView* itemContainerView_;
+
+  // Delegate that handles resizing our view.
+  id<ViewResizer> resizeDelegate_;
 };
 
-- (id)initWithBrowser:(Browser*)browser contentArea:(NSView*)content;
+- (id)initWithBrowser:(Browser*)browser
+       resizeDelegate:(id<ViewResizer>)resizeDelegate;
 
 - (DownloadShelf*)bridge;
 - (BOOL)isVisible;
@@ -67,9 +67,6 @@ class DownloadShelf;
 
 - (void)addDownloadItem:(BaseDownloadItemModel*)model;
 
-// Resizes the download shelf based on the state of the content area.
-- (void)resizeDownloadShelf;
-
 // Remove a download, possibly via clearing browser data.
 - (void)remove:(DownloadItemController*)download;