diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:55:56 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:55:56 +0000 |
| commit | 1fd1a5043e4de3078e3e05684a14055474da0d0b (patch) | |
| tree | 25d28a7c713fd8bbda6e28bd599d4a890e6b3254 /content/browser/browsing_instance.cc | |
| parent | 76b0f686facc70c33f2983c115933006654ee482 (diff) | |
| download | chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.zip chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.tar.gz chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.tar.bz2 | |
Move WebUIFactory to chrome/, try 2.
first try was r79691
This fixes the SiteInstance unit test failure. SiteInstance has all kinds of dependencies into chrome/. This fixes the unittest just enough to get it passing without trying to refactor SiteInstance at all.
BUG=77092
TEST=trybots, again
Review URL: http://codereview.chromium.org/6731060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browsing_instance.cc')
| -rw-r--r-- | content/browser/browsing_instance.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index 1759fc0..be55f5e 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -9,8 +9,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" +#include "content/browser/content_browser_client.h" #include "content/browser/site_instance.h" #include "content/browser/webui/web_ui_factory.h" +#include "content/common/content_client.h" // static BrowsingInstance::ProfileSiteInstanceMap @@ -39,9 +41,10 @@ bool BrowsingInstance::ShouldUseProcessPerSite(const GURL& url) { return true; // DevTools pages have WebUI type but should not reuse the same host. - if (WebUIFactory::UseWebUIForURL(profile_, url) && - !url.SchemeIs(chrome::kChromeDevToolsScheme)) + if (content::WebUIFactory::Get()->UseWebUIForURL(profile_, url) && + !url.SchemeIs(chrome::kChromeDevToolsScheme)) { return true; + } // In all other cases, don't use process-per-site logic. return false; |