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/browser/browsing_instance.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'content/browser/browsing_instance.cc') diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index b82ef96..ae42e29 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -9,11 +9,12 @@ #include "content/browser/site_instance_impl.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" -#include "content/public/browser/web_ui_factory.h" +#include "content/public/browser/web_ui_controller_factory.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" using content::SiteInstance; +using content::WebUIControllerFactory; // static base::LazyInstance::Leaky @@ -43,8 +44,9 @@ bool BrowsingInstance::ShouldUseProcessPerSite(const GURL& url) { return true; // DevTools pages have WebUI type but should not reuse the same host. - if (content::GetContentClient()->browser()->GetWebUIFactory()-> - UseWebUIForURL(browser_context_, url) && + WebUIControllerFactory* factory = + content::GetContentClient()->browser()->GetWebUIControllerFactory(); + if (factory && factory->UseWebUIForURL(browser_context_, url) && !url.SchemeIs(chrome::kChromeDevToolsScheme)) { return true; } -- cgit v1.1