| Index: chrome/browser/ui/panels/panel.cc
|
| diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
|
| index 5bcab6c969788442fbc6d0a98affc2d27d6fea95..808da73636bd61674ba59c5de61e55de7171479c 100644
|
| --- a/chrome/browser/ui/panels/panel.cc
|
| +++ b/chrome/browser/ui/panels/panel.cc
|
| @@ -588,8 +588,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 notifications in the new render view host.
|
| registrar_.RemoveAll(); // Stop notifications for previous contents, if any.
|
| registrar_.Add(
|
| this,
|
| @@ -619,15 +618,8 @@ 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_));
|
| }
|
|
|
| @@ -635,7 +627,7 @@ void Panel::OnWindowSizeAvailable() {
|
| if (auto_resizable_) {
|
| RenderViewHost* render_view_host = GetRenderViewHost();
|
| if (render_view_host)
|
| - RequestRenderViewHostToDisableScrollbars(render_view_host);
|
| + EnableRendererAutoResize(render_view_host);
|
| }
|
| }
|
|
|
|
|