summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 22:13:55 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 22:13:55 +0000
commit9423d941cb200b789d482895ac644fe38d6bc048 (patch)
tree3e82d246d3ce5a1bb4eeade7a1aebff27748814d /chrome/browser/browser.cc
parent127788d038548a56be833f863c9936714f6452cb (diff)
downloadchromium_src-9423d941cb200b789d482895ac644fe38d6bc048.zip
chromium_src-9423d941cb200b789d482895ac644fe38d6bc048.tar.gz
chromium_src-9423d941cb200b789d482895ac644fe38d6bc048.tar.bz2
Remove the TestTabContents. This makes BrowserWithTestWindow use the
TestRenderViewHost instead. There are some changes to browser_commands_unittest to support this. Now that we're using proper TabContentes, I had to stub out a FocusManager call since there isn't a proper view hierarchy created. Remove TabContents collection and switching from the NavigationController. I tried to keep the same interface to the NavigationController since I tried that in a previous patch and the change blew up. Remove the TabContents factory. Callers now create a WebContents directly. Review URL: http://codereview.chromium.org/67113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index d29d7ce..bb3a4ea 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1390,12 +1390,8 @@ TabContents* Browser::CreateTabContentsForURL(
const GURL& url, const GURL& referrer, Profile* profile,
PageTransition::Type transition, bool defer_load,
SiteInstance* instance) const {
- // Create an appropriate tab contents.
- GURL real_url = url;
- TabContentsType type = TabContents::TypeForURL(&real_url);
- DCHECK(type != TAB_CONTENTS_UNKNOWN_TYPE);
-
- TabContents* contents = TabContents::CreateWithType(type, profile, instance);
+ WebContents* contents = new WebContents(profile, instance,
+ MSG_ROUTING_NONE, NULL);
contents->SetupController(profile);
if (!defer_load) {