diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 02:05:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 02:05:50 +0000 |
| commit | 863f70aa8b46421f442a089b21e1bd97a446785c (patch) | |
| tree | d3468b7ab02aaaf80c7602e7c671ea37dc7672f1 /content/browser/browsing_instance.cc | |
| parent | a3b85d85e73b838e5bc6599a779a6a725980ce6e (diff) | |
| download | chromium_src-863f70aa8b46421f442a089b21e1bd97a446785c.zip chromium_src-863f70aa8b46421f442a089b21e1bd97a446785c.tar.gz chromium_src-863f70aa8b46421f442a089b21e1bd97a446785c.tar.bz2 | |
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
Diffstat (limited to 'content/browser/browsing_instance.cc')
| -rw-r--r-- | content/browser/browsing_instance.cc | 8 |
1 files changed, 5 insertions, 3 deletions
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<BrowsingInstance::ContextSiteInstanceMap>::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; } |