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

Unified Diff: content/browser/child_process_security_policy_impl.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 6 years, 7 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: content/browser/child_process_security_policy_impl.cc
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 2dddca662ead2e954d98e64a746568585cd3743e..57cb7fa96f17635ced2021ae69b25e35db741a8f 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -176,7 +176,7 @@ class ChildProcessSecurityPolicyImpl::SecurityState {
// file:// URLs are more granular. The child may have been given
// permission to a specific file but not the file:// scheme in general.
- if (url.SchemeIs(kFileScheme)) {
+ if (url.SchemeIs(url::kFileScheme)) {
base::FilePath path;
if (net::FileURLToFilePath(url, &path))
return ContainsKey(request_file_set_, path);
@@ -310,15 +310,15 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
// We know about these schemes and believe them to be safe.
RegisterWebSafeScheme(url::kHttpScheme);
RegisterWebSafeScheme(url::kHttpsScheme);
- RegisterWebSafeScheme(kFtpScheme);
- RegisterWebSafeScheme(kDataScheme);
+ RegisterWebSafeScheme(url::kFtpScheme);
+ RegisterWebSafeScheme(url::kDataScheme);
RegisterWebSafeScheme("feed");
- RegisterWebSafeScheme(kBlobScheme);
- RegisterWebSafeScheme(kFileSystemScheme);
+ RegisterWebSafeScheme(url::kBlobScheme);
+ RegisterWebSafeScheme(url::kFileSystemScheme);
// We know about the following pseudo schemes and treat them specially.
RegisterPseudoScheme(kAboutScheme);
- RegisterPseudoScheme(kJavaScriptScheme);
+ RegisterPseudoScheme(url::kJavaScriptScheme);
RegisterPseudoScheme(kViewSourceScheme);
}
@@ -434,7 +434,7 @@ void ChildProcessSecurityPolicyImpl::GrantRequestURL(
void ChildProcessSecurityPolicyImpl::GrantRequestSpecificFileURL(
int child_id,
const GURL& url) {
- if (!url.SchemeIs(kFileScheme))
+ if (!url.SchemeIs(url::kFileScheme))
return;
{
@@ -558,7 +558,7 @@ void ChildProcessSecurityPolicyImpl::GrantWebUIBindings(int child_id) {
state->second->GrantScheme(kChromeUIScheme);
// Web UI pages can contain links to file:// URLs.
- state->second->GrantScheme(kFileScheme);
+ state->second->GrantScheme(url::kFileScheme);
}
void ChildProcessSecurityPolicyImpl::GrantReadRawCookies(int child_id) {
« no previous file with comments | « content/browser/browser_url_handler_impl.cc ('k') | content/browser/child_process_security_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698