diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:32:13 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:32:13 +0000 |
commit | b4bdce24eea17d1ae5a262235122cbc2985ea011 (patch) | |
tree | 1e526a8cde10f35b8f87db4aade4f5c23261cb7c /chrome/browser/browser.cc | |
parent | d347b1ef7c061dd2405144acc795474484d511be (diff) | |
download | chromium_src-b4bdce24eea17d1ae5a262235122cbc2985ea011.zip chromium_src-b4bdce24eea17d1ae5a262235122cbc2985ea011.tar.gz chromium_src-b4bdce24eea17d1ae5a262235122cbc2985ea011.tar.bz2 |
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
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 23 |
1 files changed, 0 insertions, 23 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); |