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

Unified Diff: extensions/common/permissions/permissions_data.cc

Issue 149643010: Cleanup: Move kChromeUIScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/shell/browser/shell_content_browser_client.cc ('k') | extensions/common/url_pattern.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/permissions/permissions_data.cc
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index 825f5ff18917b2838681edc6ac102c0846f5d9e6..43a6004fd3d026ec88b01a46262041a17224cc33 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -65,7 +65,7 @@ bool CanSpecifyHostPermission(const Extension* extension,
const URLPattern& pattern,
const APIPermissionSet& permissions) {
if (!pattern.match_all_urls() &&
- pattern.MatchesScheme(chrome::kChromeUIScheme)) {
+ pattern.MatchesScheme(content::kChromeUIScheme)) {
URLPatternSet chrome_scheme_hosts = ExtensionsClient::Get()->
GetPermittedChromeSchemeHosts(extension, permissions);
if (chrome_scheme_hosts.ContainsPattern(pattern))
@@ -190,7 +190,7 @@ bool ParseHelper(Extension* extension,
valid_schemes &= ~URLPattern::SCHEME_FILE;
}
- if (pattern.scheme() != chrome::kChromeUIScheme &&
+ if (pattern.scheme() != content::kChromeUIScheme &&
!PermissionsData::CanExecuteScriptEverywhere(extension)) {
// Keep chrome:// in allowed schemes only if it's explicitly requested
// or CanExecuteScriptEverywhere is true. If the
@@ -476,7 +476,7 @@ bool PermissionsData::CanExecuteScriptOnPage(const Extension* extension,
}
if (!command_line->HasSwitch(switches::kExtensionsOnChromeURLs)) {
- if (document_url.SchemeIs(chrome::kChromeUIScheme) &&
+ if (document_url.SchemeIs(content::kChromeUIScheme) &&
!can_execute_everywhere) {
if (error)
*error = errors::kCannotAccessChromeUrl;
« no previous file with comments | « content/shell/browser/shell_content_browser_client.cc ('k') | extensions/common/url_pattern.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698