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

Unified Diff: content/browser/site_instance.cc

Issue 6693054: Get rid of extensions dependency from content\browser. (Closed) Base URL: svn://chrome-svn/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 | « content/browser/site_instance.h ('k') | content/browser/site_instance_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/site_instance.cc
===================================================================
--- content/browser/site_instance.cc (revision 80243)
+++ content/browser/site_instance.cc (working copy)
@@ -4,7 +4,6 @@
#include "content/browser/site_instance.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/renderer_host/browser_render_process_host.h"
#include "chrome/common/url_constants.h"
#include "content/browser/browsing_instance.h"
@@ -190,18 +189,7 @@
/*static*/
GURL SiteInstance::GetEffectiveURL(Profile* profile, const GURL& url) {
- if (!profile || !profile->GetExtensionService())
- return url;
-
- const Extension* extension =
- profile->GetExtensionService()->GetExtensionByWebExtent(url);
- if (extension) {
- // If the URL is part of an extension's web extent, convert it to an
- // extension URL.
- return extension->GetResourceURL(url.path());
- } else {
- return url;
- }
+ return content::GetContentClient()->browser()->GetEffectiveURL(profile, url);
}
/*static*/
« no previous file with comments | « content/browser/site_instance.h ('k') | content/browser/site_instance_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698