| 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 e193dc2e71f586ccbb9a6cb3ec494e4606e7833a..4146414e9ee98d649c48f36eb3a7fe57aae42077 100644
|
| --- a/content/browser/renderer_host/render_view_host.cc
|
| +++ b/content/browser/renderer_host/render_view_host.cc
|
| @@ -1091,7 +1091,7 @@ void RenderViewHost::OnMsgDidContentsPreferredSizeChange(
|
| }
|
|
|
| void RenderViewHost::OnRenderAutoResized(const gfx::Size& new_size) {
|
| - delegate_->UpdatePreferredSize(new_size);
|
| + delegate_->ResizeDueToAutoResize(new_size);
|
| }
|
|
|
| void RenderViewHost::OnMsgDidChangeScrollbarsForMainFrame(
|
| @@ -1414,6 +1414,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));
|
|
|