diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 16:48:07 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 16:48:07 +0000 |
| commit | 3ff3493b8904ee4db7b41cd1676ccdcb127ecbd8 (patch) | |
| tree | 6d3dcf4bf6a0f19d553a3e1a2c2eba0a81e72ce3 /chrome/browser/browser.cc | |
| parent | a64691f2882ea7403dc2fcd39f026583e12429fe (diff) | |
| download | chromium_src-3ff3493b8904ee4db7b41cd1676ccdcb127ecbd8.zip chromium_src-3ff3493b8904ee4db7b41cd1676ccdcb127ecbd8.tar.gz chromium_src-3ff3493b8904ee4db7b41cd1676ccdcb127ecbd8.tar.bz2 | |
Make the RenderViewHostFactory a global. This prevents us from having to pass
a factory pointer around all the time. Removing TestTabContents will require
making the Browser object keep track of the Factory pointer as well, so I think
the global is the best approach and cleans some things up.
Review URL: http://codereview.chromium.org/62044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index ab5037a..374ca34 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1346,8 +1346,7 @@ TabContents* Browser::CreateTabContentsForURL( TabContentsType type = TabContents::TypeForURL(&real_url); DCHECK(type != TAB_CONTENTS_UNKNOWN_TYPE); - TabContents* contents = TabContents::CreateWithType(type, profile, instance, - NULL); + TabContents* contents = TabContents::CreateWithType(type, profile, instance); contents->SetupController(profile); if (!defer_load) { @@ -2382,8 +2381,7 @@ 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, - NULL); + return new NavigationController(profile_, navigations, selected_navigation); } else { // No navigations. Create a tab with about:blank. TabContents* contents = |