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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 1211243010: [Service Worker Registration] Registered extension scheme to allow service workers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added dev test Created 5 years, 5 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: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index c22774aaed8605b259b6b123cc0ed8c666dc75ff..4cc5aaf2e4e8b9bb31890ddf8d64e363c003ea10 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -14,6 +14,7 @@
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/values.h"
#include "content/grit/content_resources.h"
@@ -28,6 +29,7 @@
#include "extensions/common/extension_messages.h"
#include "extensions/common/extension_urls.h"
#include "extensions/common/feature_switch.h"
+#include "extensions/common/features/behavior_feature.h"
#include "extensions/common/features/feature.h"
#include "extensions/common/features/feature_provider.h"
#include "extensions/common/manifest.h"
@@ -912,6 +914,7 @@ void Dispatcher::OnMessageInvoke(const std::string& extension_id,
void Dispatcher::OnSetChannel(int channel) {
delegate_->SetChannel(channel);
+ AddChannelSpecificFeatures();
}
void Dispatcher::OnSetFunctionNames(const std::vector<std::string>& names) {
@@ -1448,4 +1451,13 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
}
}
+void Dispatcher::AddChannelSpecificFeatures() {
+ // chrome-extension: resources should be allowed to register a Service Worker.
+ if (FeatureProvider::GetBehaviorFeature(BehaviorFeature::kServiceWorker)
+ ->IsAvailableToEnvironment()
+ .is_available())
+ WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers(
+ WebString::fromUTF8(extensions::kExtensionScheme));
Devlin 2015/07/13 19:32:25 nit: no extensions::
annekao 2015/07/13 21:15:59 Done.
+}
+
} // namespace extensions
« extensions/common/api/_behavior_features.json ('K') | « extensions/renderer/dispatcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698