diff options
| author | sungmann.cho@navercorp.com <sungmann.cho@navercorp.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 21:32:26 +0000 |
|---|---|---|
| committer | sungmann.cho@navercorp.com <sungmann.cho@navercorp.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 21:32:26 +0000 |
| commit | cca6f39ac7e4b12707b42ad05efd822106e8f396 (patch) | |
| tree | bb3d0dd8fe7ac653b1debc119237df2a968f790d /extensions | |
| parent | 7db86399f99987aa1a041692f53b41353b7ebf7b (diff) | |
| download | chromium_src-cca6f39ac7e4b12707b42ad05efd822106e8f396.zip chromium_src-cca6f39ac7e4b12707b42ad05efd822106e8f396.tar.gz chromium_src-cca6f39ac7e4b12707b42ad05efd822106e8f396.tar.bz2 | |
Move some content url constants to /url.
This CL moves the content url constants below to /url:
content::kBlobScheme
content::kDataScheme
content::kFileScheme
content::kFileSystemScheme
content::kFtpScheme
content::kJavaScriptScheme
content::kMailToScheme
This is a follow up to https://codereview.chromium.org/254763005.
BUG=306258
TBR=finnur@chromium.org,mkosiba@chromium.org,derat@chromium.org
TEST=compile
Review URL: https://codereview.chromium.org/273193004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/extension_web_contents_observer.cc | 2 | ||||
| -rw-r--r-- | extensions/common/permissions/permission_message_util.cc | 4 | ||||
| -rw-r--r-- | extensions/common/permissions/permissions_data.cc | 2 | ||||
| -rw-r--r-- | extensions/common/url_pattern.cc | 12 | ||||
| -rw-r--r-- | extensions/common/url_pattern_set.cc | 4 | ||||
| -rw-r--r-- | extensions/renderer/dispatcher.cc | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/extensions/browser/extension_web_contents_observer.cc b/extensions/browser/extension_web_contents_observer.cc index fd02a90..a66a6f2 100644 --- a/extensions/browser/extension_web_contents_observer.cc +++ b/extensions/browser/extension_web_contents_observer.cc @@ -55,7 +55,7 @@ void ExtensionWebContentsObserver::RenderViewCreated( ExtensionPrefs* prefs = ExtensionPrefs::Get(browser_context_); if (prefs->AllowFileAccess(extension->id())) { content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( - process->GetID(), content::kFileScheme); + process->GetID(), url::kFileScheme); } } diff --git a/extensions/common/permissions/permission_message_util.cc b/extensions/common/permissions/permission_message_util.cc index 25006ed..0b2e1a9 100644 --- a/extensions/common/permissions/permission_message_util.cc +++ b/extensions/common/permissions/permission_message_util.cc @@ -6,13 +6,13 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "content/public/common/url_constants.h" #include "extensions/common/permissions/permission_message.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern_set.h" #include "grit/extensions_strings.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/base/l10n/l10n_util.h" +#include "url/url_constants.h" using extensions::PermissionMessage; using extensions::PermissionSet; @@ -102,7 +102,7 @@ std::set<std::string> GetDistinctHosts(const URLPatternSet& host_patterns, for (URLPatternSet::const_iterator i = host_patterns.begin(); i != host_patterns.end(); ++i) { - if (exclude_file_scheme && i->scheme() == content::kFileScheme) + if (exclude_file_scheme && i->scheme() == url::kFileScheme) continue; std::string host = i->host(); diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc index 268fb82..2b57d4f 100644 --- a/extensions/common/permissions/permissions_data.cc +++ b/extensions/common/permissions/permissions_data.cc @@ -180,7 +180,7 @@ bool ParseHelper(Extension* extension, // to match all paths. pattern.SetPath("/*"); int valid_schemes = pattern.valid_schemes(); - if (pattern.MatchesScheme(content::kFileScheme) && + if (pattern.MatchesScheme(url::kFileScheme) && !PermissionsData::CanExecuteScriptEverywhere(extension)) { extension->set_wants_file_access(true); if (!(extension->creation_flags() & Extension::ALLOW_FILE_ACCESS)) diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc index 020be3c..885eab9 100644 --- a/extensions/common/url_pattern.cc +++ b/extensions/common/url_pattern.cc @@ -22,11 +22,11 @@ namespace { const char* kValidSchemes[] = { url::kHttpScheme, url::kHttpsScheme, - content::kFileScheme, - content::kFtpScheme, + url::kFileScheme, + url::kFtpScheme, content::kChromeUIScheme, extensions::kExtensionScheme, - content::kFileSystemScheme, + url::kFileSystemScheme, }; const int kValidSchemeMasks[] = { @@ -192,7 +192,7 @@ URLPattern::ParseResult URLPattern::Parse(const std::string& pattern) { if (!standard_scheme) { path_start_pos = host_start_pos; - } else if (scheme_ == content::kFileScheme) { + } else if (scheme_ == url::kFileScheme) { size_t host_end_pos = pattern.find(kPathSeparator, host_start_pos); if (host_end_pos == std::string::npos) { // Allow hostname omission. @@ -426,7 +426,7 @@ const std::string& URLPattern::GetAsString() const { std::string spec = scheme_ + (standard_scheme ? content::kStandardSchemeSeparator : ":"); - if (scheme_ != content::kFileScheme && standard_scheme) { + if (scheme_ != url::kFileScheme && standard_scheme) { if (match_subdomains_) { spec += "*"; if (!host_.empty()) @@ -493,7 +493,7 @@ bool URLPattern::MatchesAllSchemes( bool URLPattern::MatchesSecurityOriginHelper(const GURL& test) const { // Ignore hostname if scheme is file://. - if (scheme_ != content::kFileScheme && !MatchesHost(test)) + if (scheme_ != url::kFileScheme && !MatchesHost(test)) return false; if (!MatchesPortPattern(base::IntToString(test.EffectiveIntPort()))) diff --git a/extensions/common/url_pattern_set.cc b/extensions/common/url_pattern_set.cc index a04d634..9e9926d 100644 --- a/extensions/common/url_pattern_set.cc +++ b/extensions/common/url_pattern_set.cc @@ -10,10 +10,10 @@ #include "base/memory/linked_ptr.h" #include "base/stl_util.h" #include "base/values.h" -#include "content/public/common/url_constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/url_pattern.h" #include "url/gurl.h" +#include "url/url_constants.h" namespace extensions { @@ -198,7 +198,7 @@ bool URLPatternSet::Populate(const std::vector<std::string>& patterns, } return false; } - if (!allow_file_access && pattern.MatchesScheme(content::kFileScheme)) { + if (!allow_file_access && pattern.MatchesScheme(url::kFileScheme)) { pattern.SetValidSchemes( pattern.valid_schemes() & ~URLPattern::SCHEME_FILE); } diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index bba2087..df35567 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -795,9 +795,9 @@ void Dispatcher::UpdateOriginPermissions( const char* schemes[] = { url::kHttpScheme, url::kHttpsScheme, - content::kFileScheme, + url::kFileScheme, content::kChromeUIScheme, - content::kFtpScheme, + url::kFtpScheme, }; for (size_t j = 0; j < arraysize(schemes); ++j) { if (i->MatchesScheme(schemes[j])) { |