summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-31 00:58:14 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-31 00:58:14 +0000
commitd8a179c1d098dbc3e65f612fbeb4cdee89b37b91 (patch)
tree34070e1feddf56e0823c3325687e2663a2923dbe /chrome/browser
parent3d1b7c7ba93735d06d39e439fa84585029a8d2a0 (diff)
downloadchromium_src-d8a179c1d098dbc3e65f612fbeb4cdee89b37b91.zip
chromium_src-d8a179c1d098dbc3e65f612fbeb4cdee89b37b91.tar.gz
chromium_src-d8a179c1d098dbc3e65f612fbeb4cdee89b37b91.tar.bz2
The upstream change to make popup shrinking work properly is a big project, so I'm doing a quick hack here so that we don't ship more builds with it broken.
BUG=30291 TEST=Install news sample extension. Expand a section, then contract it. Popup should contract too. Review URL: http://codereview.chromium.org/556058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_host.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index ef06bef..ec519ff 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -647,8 +647,12 @@ void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
extension_function_dispatcher_.reset(
new ExtensionFunctionDispatcher(render_view_host, this, url_));
- render_view_host->Send(new ViewMsg_EnablePreferredSizeChangedMode(
- render_view_host->routing_id()));
+ if (extension_host_type_ == ViewType::EXTENSION_TOOLSTRIP ||
+ extension_host_type_ == ViewType::EXTENSION_MOLE ||
+ extension_host_type_ == ViewType::EXTENSION_POPUP) {
+ render_view_host->Send(new ViewMsg_EnablePreferredSizeChangedMode(
+ render_view_host->routing_id()));
+ }
}
int ExtensionHost::GetBrowserWindowID() const {