Reland r23358 with a fix for linux unit_tests:

Better location for setting the size of tab contents.  This should
catch all code paths.  I noticed that middle clicking a bookmark
wasn't working, so I found a single place to do this.

This code is always run when a tab is added and it sizes the
contents when it's loading in the background.

BUG=619

TBR=japhet

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


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

3 files changed, 19 insertions, 25 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 5fae3c8..c6c7ce6 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1503,17 +1503,6 @@ TabContents* Browser::CreateTabContentsForURL(
   TabContents* contents = new TabContents(profile, instance,
                                           MSG_ROUTING_NONE, NULL);
 
-  // Ensure that the new TabContentsView begins at the same size as the
-  // previous TabContentsView if it existed.  Otherwise, the initial WebKit
-  // layout will be performed based on a width of 0 pixels, causing a
-  // very long, narrow, inaccurate layout.  Because some scripts on pages (as
-  // well as WebKit's anchor link location calculation) are run on the initial
-  // layout and not recalculated later, we need to ensure the first layout is
-  // performed with sane view dimensions even when we're opening a new
-  // background tab.
-  if (TabContents* old_contents = tabstrip_model_.GetSelectedTabContents())
-    contents->view()->SizeContents(old_contents->view()->GetContainerSize());
-
   if (!defer_load) {
     // Load the initial URL before adding the new tab contents to the tab strip
     // so that the tab contents has navigation state.
@@ -1831,18 +1820,6 @@ void Browser::AddNewContents(TabContents* source,
                             initial_pos, user_gesture);
     browser->window()->Show();
   } else if (disposition != SUPPRESS_OPEN) {
-    // Ensure that the new TabContentsView begins at the same size as the
-    // previous TabContentsView if it existed.  Otherwise, the initial WebKit
-    // layout will be performed based on a width of 0 pixels, causing a
-    // very long, narrow, inaccurate layout.  Because some scripts on pages (as
-    // well as WebKit's anchor link location calculation) are run on the
-    // initial layout and not recalculated later, we need to ensure the first
-    // layout is performed with sane view dimensions even when we're opening a
-    // new background tab.
-    if (TabContents* old_contents = tabstrip_model_.GetSelectedTabContents()) {
-      new_contents->view()->SizeContents(
-          old_contents->view()->GetContainerSize());
-    }
     tabstrip_model_.AddTabContents(new_contents, -1, false,
                                    PageTransition::LINK,
                                    disposition == NEW_FOREGROUND_TAB);
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
index 00c546d..1ddf615 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
@@ -582,8 +582,11 @@ void TabContentsViewGtk::SizeContents(const gfx::Size& size) {
   if (tab_contents()->render_widget_host_view()) {
     GtkWidget* widget =
         tab_contents()->render_widget_host_view()->GetNativeView();
-    widget->allocation.width = size.width();
-    widget->allocation.height = size.height();
+    // During unit tests, |widget| can be NULL.
+    if (widget) {
+      widget->allocation.width = size.width();
+      widget->allocation.height = size.height();
+    }
   }
 }
 
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 6712ec1..2883cd0 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
@@ -387,6 +388,19 @@ void TabStripModel::AddTabContents(TabContents* contents,
   InsertTabContentsAt(index, contents, foreground, inherit_group);
   if (inherit_group && transition == PageTransition::TYPED)
     contents_data_.at(index)->reset_group_on_select = true;
+
+  // Ensure that the new TabContentsView begins at the same size as the
+  // previous TabContentsView if it existed.  Otherwise, the initial WebKit
+  // layout will be performed based on a width of 0 pixels, causing a
+  // very long, narrow, inaccurate layout.  Because some scripts on pages (as
+  // well as WebKit's anchor link location calculation) are run on the
+  // initial layout and not recalculated later, we need to ensure the first
+  // layout is performed with sane view dimensions even when we're opening a
+  // new background tab.
+  if (TabContents* old_contents = GetSelectedTabContents()) {
+    if (!foreground)
+      contents->view()->SizeContents(old_contents->view()->GetContainerSize());
+  }
 }
 
 void TabStripModel::CloseSelectedTab() {