diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-04 21:32:40 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-04 21:32:40 +0000 |
| commit | 965524b257d99bbc4c10e82a1294ed1f91516e2c (patch) | |
| tree | e23e34f5a12b995a10b94b726f36a59dc32393f8 /chrome/browser/browser.cc | |
| parent | 2b4355c4590724ae676f0ec5a8230e5c8c4cddf9 (diff) | |
| download | chromium_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/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 26ade9e..16544fd 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -28,7 +28,6 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/site_instance.h" -#include "chrome/browser/tab_contents/tab_contents_type.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/browser/tab_contents/web_contents_view.h" #include "chrome/common/chrome_constants.h" @@ -1339,7 +1338,8 @@ TabContents* Browser::CreateTabContentsForURL( TabContentsType type = TabContents::TypeForURL(&real_url); DCHECK(type != TAB_CONTENTS_UNKNOWN_TYPE); - TabContents* contents = TabContents::CreateWithType(type, profile, instance); + TabContents* contents = TabContents::CreateWithType(type, profile, instance, + NULL); contents->SetupController(profile); if (!defer_load) { @@ -2365,7 +2365,8 @@ NavigationController* Browser::BuildRestoredNavigationController( selected_navigation < static_cast<int>(navigations.size())); // Create a NavigationController. This constructor creates the appropriate // set of TabContents. - return new NavigationController(profile_, navigations, selected_navigation); + return new NavigationController(profile_, navigations, selected_navigation, + NULL); } else { // No navigations. Create a tab with about:blank. TabContents* contents = |