Index: extensions/renderer/dispatcher.cc |
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc |
index 5618452572f606d24a74fd9d639a3fd0e7a5b009..54805aa93c6e80414b63f28d629b3c2908e99485 100644 |
--- a/extensions/renderer/dispatcher.cc |
+++ b/extensions/renderer/dispatcher.cc |
@@ -328,9 +328,9 @@ void Dispatcher::DidCreateScriptContext( |
module_system->Require("denyAppView"); |
} |
- if (extensions::FeatureSwitch::worker_frame()->IsEnabled() && |
- context->GetAvailability("workerFrameInternal").is_available()) { |
- module_system->Require("workerframe"); |
+ if (extensions::FeatureSwitch::surface_worker()->IsEnabled() && |
+ context->GetAvailability("surfaceWorkerInternal").is_available()) { |
+ module_system->Require("surfaceWorker"); |
} |
// Note: setting up the WebView class here, not the chrome.webview API. |
@@ -551,7 +551,7 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() { |
resources.push_back(std::make_pair("guestViewContainer", |
IDR_GUEST_VIEW_CONTAINER_JS)); |
resources.push_back(std::make_pair("webView", IDR_WEB_VIEW_JS)); |
- resources.push_back(std::make_pair("workerframe", IDR_WORKER_FRAME_JS)); |
+ resources.push_back(std::make_pair("surfaceWorker", IDR_SURFACE_VIEW_JS)); |
resources.push_back(std::make_pair("webViewActionRequests", |
IDR_WEB_VIEW_ACTION_REQUESTS_JS)); |
resources.push_back(std::make_pair("webViewApiMethods", |
@@ -1087,9 +1087,9 @@ void Dispatcher::EnableCustomElementWhiteList() { |
"extensionoptionsbrowserplugin"); |
blink::WebCustomElement::addEmbedderCustomElementName("webview"); |
blink::WebCustomElement::addEmbedderCustomElementName("webviewbrowserplugin"); |
- blink::WebCustomElement::addEmbedderCustomElementName("workerframe"); |
+ blink::WebCustomElement::addEmbedderCustomElementName("surfaceview"); |
blink::WebCustomElement::addEmbedderCustomElementName( |
- "workerframebrowserplugin"); |
+ "surfaceviewbrowserplugin"); |
} |
void Dispatcher::UpdateBindings(const std::string& extension_id) { |
@@ -1230,8 +1230,8 @@ void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system, |
} |
bool Dispatcher::IsRuntimeAvailableToContext(ScriptContext* context) { |
- if (extensions::FeatureSwitch::worker_frame()->IsEnabled() && |
- context->GetAvailability("workerFrameInternal").is_available()) { |
+ if (extensions::FeatureSwitch::surface_worker()->IsEnabled() && |
+ context->GetAvailability("surfaceWorkerInternal").is_available()) { |
return true; |
} |
for (const auto& extension : extensions_) { |