Chromium Code Reviews| Index: chrome/browser/ui/panels/panel.cc |
| diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc |
| index c2e970df4c66cb8ed9e6c72deb6e5ecf80fb0e51..791014cffef298f0c9febdb649e52af1006437da 100644 |
| --- a/chrome/browser/ui/panels/panel.cc |
| +++ b/chrome/browser/ui/panels/panel.cc |
| @@ -580,8 +580,7 @@ void Panel::EnableTabContentsAutoResize(TabContents* tab_contents) { |
| EnableRendererAutoResize(render_view_host); |
| // We also need to know when the render view host changes in order |
| - // to turn on preferred size changed notifications in the new |
| - // render view host. |
| + // to turn on autosize in the new render view host. |
| registrar_.RemoveAll(); // Stop notifications for previous contents, if any. |
| registrar_.Add( |
| this, |
| @@ -611,26 +610,11 @@ RenderViewHost* Panel::GetRenderViewHost() const { |
| void Panel::EnableRendererAutoResize(RenderViewHost* render_view_host) { |
| DCHECK(auto_resizable_); |
| DCHECK(render_view_host); |
| - render_view_host->EnablePreferredSizeMode(); |
| - RequestRenderViewHostToDisableScrollbars(render_view_host); |
| -} |
| - |
| -void Panel::RequestRenderViewHostToDisableScrollbars( |
| - RenderViewHost* render_view_host) { |
| - DCHECK(auto_resizable_); |
| - DCHECK(render_view_host); |
| - render_view_host->DisableScrollbarsForThreshold( |
| + render_view_host->EnableAutoResize( |
| + min_size_, |
| native_panel_->ContentSizeFromWindowSize(max_size_)); |
| } |
| -void Panel::OnWindowSizeAvailable() { |
|
jennb
2011/11/28 18:02:24
We still need this because on GTK, ContentSizeFrom
|
| - if (auto_resizable_) { |
| - RenderViewHost* render_view_host = GetRenderViewHost(); |
| - if (render_view_host) |
| - RequestRenderViewHostToDisableScrollbars(render_view_host); |
| - } |
| -} |
| - |
| Browser* Panel::browser() const { |
| return native_panel_->GetPanelBrowser(); |
| } |