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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 564913003: Moving web_view.js to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 a8b66dfbdaeb0da3f77b92c65fd477cd5ee49ba5..af51684a3393c2edc012d34254899d7daf485cff 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -500,8 +500,15 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
IDR_UNCAUGHT_EXCEPTION_HANDLER_JS));
resources.push_back(std::make_pair("unload_event", IDR_UNLOAD_EVENT_JS));
resources.push_back(std::make_pair("utils", IDR_UTILS_JS));
+ // Note: webView not webview so that this doesn't interfere with the
+ // chrome.webview API bindings.
+ resources.push_back(std::make_pair("webView", IDR_WEB_VIEW_JS));
+ resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS));
+ resources.push_back(
+ std::make_pair("webViewExperimental", IDR_WEB_VIEW_EXPERIMENTAL_JS));
resources.push_back(std::make_pair("webViewInternal",
IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
+ resources.push_back(std::make_pair("denyWebView", IDR_WEB_VIEW_DENY_JS));
resources.push_back(
std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS));
resources.push_back(
« no previous file with comments | « chrome/renderer/resources/renderer_resources.grd ('k') | extensions/renderer/resources/extensions_renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698