diff options
| author | aboxhall@chromium.org <aboxhall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 12:57:29 +0000 |
|---|---|---|
| committer | aboxhall@chromium.org <aboxhall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 12:57:29 +0000 |
| commit | ac2e2acd50d662bfb99c6bbd98a69a5c4b5911f9 (patch) | |
| tree | 71bb06926c3d7a124fdf7eb045d352e11cf50f5d /extensions | |
| parent | fc7a1dbbc6fde650ae0d01383fd8818287bc2dd8 (diff) | |
| download | chromium_src-ac2e2acd50d662bfb99c6bbd98a69a5c4b5911f9.zip chromium_src-ac2e2acd50d662bfb99c6bbd98a69a5c4b5911f9.tar.gz chromium_src-ac2e2acd50d662bfb99c6bbd98a69a5c4b5911f9.tar.bz2 | |
Allow extensions on chrome:// URLs, when flag is set and permission is explicitly requested in the manifest.
BUG=174183
Review URL: https://chromiumcodereview.appspot.com/12792005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/common/url_pattern.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extensions/common/url_pattern.h b/extensions/common/url_pattern.h index a6dfa74..7d55b8d 100644 --- a/extensions/common/url_pattern.h +++ b/extensions/common/url_pattern.h @@ -188,6 +188,9 @@ class URLPattern { // Get an error string for a ParseResult. static const char* GetParseResultString(URLPattern::ParseResult parse_result); + // Checks whether the bit is set for the given scheme in the given scheme mask + static bool IsSchemeBitSet(const std::string& scheme, const int mask); + private: // Returns true if any of the |schemes| items matches our scheme. bool MatchesAnyScheme(const std::vector<std::string>& schemes) const; @@ -206,8 +209,7 @@ class URLPattern { // A bitmask containing the schemes which are considered valid for this // pattern. Parse() uses this to decide whether a pattern contains a valid - // scheme. MatchesScheme uses this to decide whether a wildcard scheme_ - // matches a given test scheme. + // scheme. int valid_schemes_; // True if this is a special-case "<all_urls>" pattern. |