From 863f70aa8b46421f442a089b21e1bd97a446785c Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 27 Jan 2012 02:05:50 +0000 Subject: Rename WebUIFactory to WebUIControllerFactory since that's what it creates now. I've removed EmptyWebUIFactory, since that doesn't fit in well with Content API now. There were only a few places in the code that called it, and handling NULL wasn't much work. BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9288074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119341 0039d316-1c4b-4281-b951-d872f2087c98 --- content/shell/shell_content_browser_client.cc | 6 ++---- content/shell/shell_content_browser_client.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'content/shell') diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc index 79d9be7..65e784b 100644 --- a/content/shell/shell_content_browser_client.cc +++ b/content/shell/shell_content_browser_client.cc @@ -5,7 +5,6 @@ #include "content/shell/shell_content_browser_client.h" #include "base/file_path.h" -#include "content/browser/webui/empty_web_ui_factory.h" #include "content/shell/shell.h" #include "content/shell/shell_browser_main.h" #include "googleurl/src/gurl.h" @@ -53,9 +52,8 @@ void ShellContentBrowserClient::RenderProcessHostCreated( RenderProcessHost* host) { } -WebUIFactory* ShellContentBrowserClient::GetWebUIFactory() { - // Return an empty factory so callsites don't have to check for NULL. - return EmptyWebUIFactory::GetInstance(); +WebUIControllerFactory* ShellContentBrowserClient::GetWebUIControllerFactory() { + return NULL; } GURL ShellContentBrowserClient::GetEffectiveURL( diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h index f9238cc..26ccebe 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/shell_content_browser_client.h @@ -33,7 +33,7 @@ class ShellContentBrowserClient : public ContentBrowserClient { RenderViewHost* render_view_host) OVERRIDE; virtual void RenderProcessHostCreated( RenderProcessHost* host) OVERRIDE; - virtual WebUIFactory* GetWebUIFactory() OVERRIDE; + virtual WebUIControllerFactory* GetWebUIControllerFactory() OVERRIDE; virtual GURL GetEffectiveURL(content::BrowserContext* browser_context, const GURL& url) OVERRIDE; virtual bool ShouldUseProcessPerSite(BrowserContext* browser_context, -- cgit v1.1