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

Unified Diff: extensions/common/url_pattern.cc

Issue 2449913002: Support WebSocket in WebRequest API. (Closed)
Patch Set: Remove FIXME because the test works. Add TODO for more tests. Created 4 years, 1 month 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: extensions/common/url_pattern.cc
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index 81edf7f55b09e6a74ba9fc4911421ecf3e9733de..3325277564c0acb697ec5d23ab882dec993aa015 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -31,7 +31,8 @@ const char* const kValidSchemes[] = {
url::kHttpScheme, url::kHttpsScheme,
url::kFileScheme, url::kFtpScheme,
content::kChromeUIScheme, extensions::kExtensionScheme,
- url::kFileSystemScheme,
+ url::kFileSystemScheme, url::kWsScheme,
+ url::kWssScheme,
};
const int kValidSchemeMasks[] = {
@@ -42,6 +43,8 @@ const int kValidSchemeMasks[] = {
URLPattern::SCHEME_CHROMEUI,
URLPattern::SCHEME_EXTENSION,
URLPattern::SCHEME_FILESYSTEM,
+ URLPattern::SCHEME_WS,
+ URLPattern::SCHEME_WSS,
};
static_assert(arraysize(kValidSchemes) == arraysize(kValidSchemeMasks),
@@ -316,7 +319,7 @@ bool URLPattern::SetScheme(const std::string& scheme) {
spec_.clear();
scheme_ = scheme;
if (scheme_ == "*") {
- valid_schemes_ &= (SCHEME_HTTP | SCHEME_HTTPS);
+ valid_schemes_ &= (SCHEME_HTTP | SCHEME_HTTPS | SCHEME_WS | SCHEME_WSS);
} else if (!IsValidScheme(scheme_)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698