Index: chrome/browser/ui/cocoa/browser_window_controller.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm |
index f08833a05bd113b51aa101d6484d927796046bf3..c81ef74826f8b832330efb3a59b0659722ff07f3 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm |
@@ -946,10 +946,11 @@ using content::WebContents; |
// Disable subview resizing while resizing the window, or else we will get |
// unwanted renderer resizes. The calling code must call layoutSubviews to |
// make things right again. |
- NSView* contentView = [window contentView]; |
- [contentView setAutoresizesSubviews:NO]; |
+ NSView* chromeContentView = [self chromeContentView]; |
+ BOOL autoresizesSubviews = [chromeContentView autoresizesSubviews]; |
+ [chromeContentView setAutoresizesSubviews:NO]; |
[window setFrame:windowFrame display:NO]; |
- [contentView setAutoresizesSubviews:YES]; |
+ [chromeContentView setAutoresizesSubviews:autoresizesSubviews]; |
return YES; |
} |
@@ -1573,7 +1574,7 @@ using content::WebContents; |
if (!downloadShelfController_.get()) { |
downloadShelfController_.reset([[DownloadShelfController alloc] |
initWithBrowser:browser_.get() resizeDelegate:self]); |
- [[[self window] contentView] addSubview:[downloadShelfController_ view]]; |
+ [self.chromeContentView addSubview:[downloadShelfController_ view]]; |
} |
} |