From 3ff3493b8904ee4db7b41cd1676ccdcb127ecbd8 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 7 Apr 2009 16:48:07 +0000 Subject: 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 --- chrome/browser/tab_contents/navigation_controller.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'chrome/browser/tab_contents/navigation_controller.h') diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h index 2d1364f..04160dc 100644 --- a/chrome/browser/tab_contents/navigation_controller.h +++ b/chrome/browser/tab_contents/navigation_controller.h @@ -21,7 +21,6 @@ class NavigationEntry; class GURL; class Profile; -class RenderViewHostFactory; class TabContents; class SiteInstance; class SkBitmap; @@ -129,13 +128,11 @@ class NavigationController { // Creates a NavigationController from the specified history. Processing // for this is asynchronous and handled via the RestoreHelper (in - // navigation_controller.cc). The RenderViewHostFactory will be passed to - // new TabContentses, it is non-NULL only for testing. + // navigation_controller.cc). NavigationController( Profile* profile, const std::vector& navigations, - int selected_navigation, - RenderViewHostFactory* rvh_factory); + int selected_navigation); ~NavigationController(); // Begin the destruction sequence for this NavigationController and all its @@ -494,10 +491,6 @@ class NavigationController { // The user profile associated with this controller Profile* profile_; - // Non-owning pointer to the factory to pass to new TabContentes. This will be - // NULL except in testing, where it is used to create mock RVH's. - RenderViewHostFactory* rvh_factory_; - // List of NavigationEntry for this tab typedef std::vector > NavigationEntries; NavigationEntries entries_; -- cgit v1.1