Index: chrome/browser/extensions/extension_host.cc |
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc |
index 71c74425484d14374f25e12458bbadadcd408496..803c56237d53460b1611620c87f19ca7b28cd2ff 100644 |
--- a/chrome/browser/extensions/extension_host.cc |
+++ b/chrome/browser/extensions/extension_host.cc |
@@ -293,10 +293,10 @@ void ExtensionHost::Observe(int type, |
} |
} |
-void ExtensionHost::UpdatePreferredSize(WebContents* source, |
- const gfx::Size& pref_size) { |
+void ExtensionHost::ResizeDueToAutoResize(WebContents* source, |
+ const gfx::Size& new_size) { |
if (view_.get()) |
- view_->UpdatePreferredSize(pref_size); |
+ view_->ResizeDueToAutoResize(new_size); |
} |
void ExtensionHost::RenderViewGone(base::TerminationStatus status) { |
@@ -334,11 +334,6 @@ void ExtensionHost::InsertInfobarCSS() { |
render_view_host()->InsertCSS(string16(), css.as_string()); |
} |
-void ExtensionHost::DisableScrollbarsForSmallWindows( |
- const gfx::Size& size_limit) { |
- render_view_host()->DisableScrollbarsForThreshold(size_limit); |
-} |
- |
void ExtensionHost::DidStopLoading() { |
bool notify = !did_stop_loading_; |
did_stop_loading_ = true; |
@@ -485,11 +480,6 @@ void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) { |
if (view_.get()) |
view_->RenderViewCreated(); |
- if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP || |
- extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR) { |
- render_view_host->EnablePreferredSizeMode(); |
- } |
- |
// If the host is bound to a browser, then extract its window id. |
// Extensions hosted in ExternalTabContainer objects may not have |
// an associated browser. |