Make extension popups shrink when their contents shrink.

BUG=26471
TEST=Load news example extension, see resizing goodness.

Review URL: http://codereview.chromium.org/400028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32305 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index bfc427d..492823f 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2546,14 +2546,13 @@ void RenderView::didChangeContentsSize(WebFrame* frame, const WebSize& size) {
     // cache the width and height and only send the IPC message when we're sure
     // they're different.
     int width = webview()->mainFrame()->contentsPreferredWidth();
+    int height = webview()->mainFrame()->documentElementScrollHeight();
+    
     if (width != preferred_size_.width() ||
-        size.height != preferred_size_.height()) {
+        height != preferred_size_.height()) {
       preferred_size_.set_width(width);
+      preferred_size_.set_height(height);
 
-      // TODO(erikkay) the contents size is not really the same as the
-      // preferred size.  It's just the current size.  This means that for
-      // height, it will only ever grow, it will never shrink.
-      preferred_size_.set_height(size.height);
       Send(new ViewHostMsg_DidContentsPreferredSizeChange(routing_id_,
                                                           preferred_size_));
     }