Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: content/browser/browsing_instance.cc

Issue 6708114: Revert 79691 - Move WebUIFactory to chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browsing_instance.cc
===================================================================
--- content/browser/browsing_instance.cc (revision 79692)
+++ content/browser/browsing_instance.cc (working copy)
@@ -9,10 +9,8 @@
#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
@@ -41,10 +39,9 @@
return true;
// DevTools pages have WebUI type but should not reuse the same host.
- if (content::WebUIFactory::Get()->UseWebUIForURL(profile_, url) &&
- !url.SchemeIs(chrome::kChromeDevToolsScheme)) {
+ if (WebUIFactory::UseWebUIForURL(profile_, url) &&
+ !url.SchemeIs(chrome::kChromeDevToolsScheme))
return true;
- }
// In all other cases, don't use process-per-site logic.
return false;
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698