summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/tab_contents.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-04 21:32:40 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-04 21:32:40 +0000
commit965524b257d99bbc4c10e82a1294ed1f91516e2c (patch)
treee23e34f5a12b995a10b94b726f36a59dc32393f8 /chrome/browser/tab_contents/tab_contents.h
parent2b4355c4590724ae676f0ec5a8230e5c8c4cddf9 (diff)
downloadchromium_src-965524b257d99bbc4c10e82a1294ed1f91516e2c.zip
chromium_src-965524b257d99bbc4c10e82a1294ed1f91516e2c.tar.gz
chromium_src-965524b257d99bbc4c10e82a1294ed1f91516e2c.tar.bz2
Remove some uses of custom tab contents types from some tests.
This required redoing the tests that used it to use the new RenderViewHost test harness. This is mostly straightforward, but required more work for the NavigationController tests. I removed a few random places that were testing for the tab types. I also made different versions of a few functions that don't take tab contents types next to the existing ones that do, so my touched code won't have to be changed again when I remove the tab contents types. Review URL: http://codereview.chromium.org/62039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.h')
-rw-r--r--chrome/browser/tab_contents/tab_contents.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 5918191..566aab7 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -85,10 +85,12 @@ class TabContents : public PageNavigator,
// (implemented in tab_contents_factory.cc)
// Creates a new TabContents of the given type. Will reuse the given
- // instance's renderer, if it is not null.
+ // instance's renderer, if it is not null. The given render view host factory
+ // will be passed to the new TabContents (it may be NULL).
static TabContents* CreateWithType(TabContentsType type,
Profile* profile,
- SiteInstance* instance);
+ SiteInstance* instance,
+ RenderViewHostFactory* rvh_factory);
// Returns the type of TabContents needed to handle the URL. |url| may
// end up being modified to contain the _real_ url being loaded if the