Index: chrome/browser/ui/panels/panel.cc |
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc |
index c0392649c2d607fd13e50c8a140d99861af57e2f..f10d868d7ce09f018dc3d6b13e42a3af038b58b0 100644 |
--- a/chrome/browser/ui/panels/panel.cc |
+++ b/chrome/browser/ui/panels/panel.cc |
@@ -126,6 +126,14 @@ void Panel::SetAutoResizable(bool resizable) { |
} else { |
browser()->tabstrip_model()->RemoveObserver(this); |
registrar_.RemoveAll(); |
+ |
+ WebContents* web_contents = browser()->GetSelectedWebContents(); |
jennb
2012/02/28 23:45:15
This is repeated in the if-section too. Move befor
levin
2012/02/29 00:04:43
Done.
|
+ if (web_contents) { |
+ // NULL might be returned if the tab has not been added. |
+ RenderViewHost* render_view_host = web_contents->GetRenderViewHost(); |
+ if (render_view_host) |
+ render_view_host->DisableAutoResize(restored_size_); |
+ } |
} |
} |
@@ -625,10 +633,9 @@ void Panel::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { |
void Panel::UpdatePreferredSize(WebContents* web_contents, |
const gfx::Size& pref_size) { |
- if (auto_resizable_) { |
- return manager()->OnPreferredWindowSizeChanged(this, |
- native_panel_->WindowSizeFromContentSize(pref_size)); |
- } |
+ DCHECK(auto_resizable_); |
+ return manager()->OnPreferredWindowSizeChanged(this, |
+ native_panel_->WindowSizeFromContentSize(pref_size)); |
} |
void Panel::ShowAvatarBubble(WebContents* web_contents, const gfx::Rect& rect) { |