Index: content/browser/renderer_host/render_view_host.cc |
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc |
index 8d951e1d1c11392a3ba3cf14366ca885a37347ef..e28ee0259b0ede15e80eb35e9706027175d6b7e1 100644 |
--- a/content/browser/renderer_host/render_view_host.cc |
+++ b/content/browser/renderer_host/render_view_host.cc |
@@ -1108,7 +1108,7 @@ void RenderViewHost::OnMsgDidContentsPreferredSizeChange( |
} |
void RenderViewHost::OnRenderAutoResized(const gfx::Size& new_size) { |
- delegate_->UpdatePreferredSize(new_size); |
+ delegate_->ResizeDueToAutoResize(new_size); |
} |
void RenderViewHost::OnMsgDidChangeScrollbarsForMainFrame( |
@@ -1432,6 +1432,11 @@ void RenderViewHost::EnableAutoResize(const gfx::Size& min_size, |
Send(new ViewMsg_EnableAutoResize(routing_id(), min_size, max_size)); |
} |
+void RenderViewHost::DisableAutoResize(const gfx::Size& new_size) { |
+ SetShouldAutoResize(false); |
+ Send(new ViewMsg_DisableAutoResize(routing_id(), new_size)); |
+} |
+ |
void RenderViewHost::ExecuteCustomContextMenuCommand( |
int action, const content::CustomContextMenuContext& context) { |
Send(new ViewMsg_CustomContextMenuAction(routing_id(), context, action)); |