diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 01:29:43 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 01:29:43 +0000 |
| commit | f3f3b7290e52b2c4bf0b9043fc2d4072cbb4c4a3 (patch) | |
| tree | c1ee0e3ca144a81757e84ab6cc6788f7d782f0b2 /content/browser/browsing_instance.cc | |
| parent | fbf75410448e70098395663fc6274d2b400cd45c (diff) | |
| download | chromium_src-f3f3b7290e52b2c4bf0b9043fc2d4072cbb4c4a3.zip chromium_src-f3f3b7290e52b2c4bf0b9043fc2d4072cbb4c4a3.tar.gz chromium_src-f3f3b7290e52b2c4bf0b9043fc2d4072cbb4c4a3.tar.bz2 | |
Move WebUIFactory into content/public/browser and make it use WebContents instead of TabContents. Update all callers accordingly.
I also got rid of WebUIFactory::Get. It was only called in a few places, and as part of the Content API we want to avoid cc files in the public directory.
BUG=98716
Review URL: http://codereview.chromium.org/9097005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browsing_instance.cc')
| -rw-r--r-- | content/browser/browsing_instance.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index caa0f46..3003f92 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -7,9 +7,9 @@ #include "base/command_line.h" #include "base/logging.h" #include "content/browser/site_instance.h" -#include "content/browser/webui/web_ui_factory.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/common/content_switches.h" #include "content/public/common/url_constants.h" @@ -44,7 +44,8 @@ bool BrowsingInstance::ShouldUseProcessPerSite(const GURL& url) { return true; // DevTools pages have WebUI type but should not reuse the same host. - if (content::WebUIFactory::Get()->UseWebUIForURL(browser_context_, url) && + if (content::GetContentClient()->browser()->GetWebUIFactory()-> + UseWebUIForURL(browser_context_, url) && !url.SchemeIs(chrome::kChromeDevToolsScheme)) { return true; } |