summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 21:27:23 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 21:27:23 +0000
commit48af406a5dc13be98bfef6c902843875399f1033 (patch)
treeb676b12697276f11f9de767bf19174f30b27740a /chrome/browser/tab_contents
parent5318be8f3c27813755e08f759ed19809bc965a86 (diff)
downloadchromium_src-48af406a5dc13be98bfef6c902843875399f1033.zip
chromium_src-48af406a5dc13be98bfef6c902843875399f1033.tar.gz
chromium_src-48af406a5dc13be98bfef6c902843875399f1033.tar.bz2
Revert "Convert tabcontentscontainer to use a vbox instead of a fixed. The"
This reverts commit r30843. This broke the findbar/download shelf animation optimization. I originally was doing this as part of fixing issue 26495, but I found a different way. TBR=estade Review URL: http://codereview.chromium.org/366009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_gtk.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
index 715d573..a51aa10 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
@@ -398,6 +398,8 @@ gboolean TabContentsViewGtk::OnSizeAllocate(GtkWidget* widget,
TabContentsViewGtk* view) {
int width = allocation->width;
int height = allocation->height;
+ view->requested_size_.set_width(width);
+ view->requested_size_.set_height(height);
// |delegate()| can be NULL here during browser teardown.
if (view->tab_contents()->delegate())
height += view->tab_contents()->delegate()->GetExtraRenderViewHeight();