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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_permissions.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android ifx Created 6 years, 6 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
Index: chrome/browser/extensions/api/web_request/web_request_permissions.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
index 8cf648dc9204a7d9c41e314f700a087813df2d6c..a5d632289e4746b1ad7976dc941e5fef2fda0fb1 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
@@ -68,11 +68,9 @@ bool IsSensitiveURL(const GURL& url) {
// to. Extensions still need specific permissions for a given URL, which is
// covered by CanExtensionAccessURL.
bool HasWebRequestScheme(const GURL& url) {
- return (url.SchemeIs(content::kAboutScheme) ||
- url.SchemeIs(url::kFileScheme) ||
+ return (url.SchemeIs(url::kAboutScheme) || url.SchemeIs(url::kFileScheme) ||
url.SchemeIs(url::kFileSystemScheme) ||
- url.SchemeIs(url::kFtpScheme) ||
- url.SchemeIs(url::kHttpScheme) ||
+ url.SchemeIs(url::kFtpScheme) || url.SchemeIs(url::kHttpScheme) ||
url.SchemeIs(url::kHttpsScheme) ||
url.SchemeIs(extensions::kExtensionScheme));
}
@@ -132,7 +130,7 @@ bool WebRequestPermissions::CanExtensionAccessURL(
case REQUIRE_HOST_PERMISSION:
// about: URLs are not covered in host permissions, but are allowed
// anyway.
- if (!((url.SchemeIs(content::kAboutScheme) ||
+ if (!((url.SchemeIs(url::kAboutScheme) ||
extension->permissions_data()->HasHostPermission(url) ||
url.GetOrigin() == extension->url()))) {
return false;

Powered by Google App Engine
This is Rietveld 408576698