Index: extensions/renderer/dispatcher.cc |
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc |
index 429056c9a998cde4a8b943890f35ff2811ad782d..2a8a0eaf9959bdede287994fcf263e0db3ef60b5 100644 |
--- a/extensions/renderer/dispatcher.cc |
+++ b/extensions/renderer/dispatcher.cc |
@@ -696,100 +696,102 @@ void Dispatcher::InvokeModuleSystemMethod(content::RenderFrame* render_frame, |
std::vector<std::pair<const char*, int>> Dispatcher::GetJsResources() { |
// Libraries. |
std::vector<std::pair<const char*, int>> resources = { |
- {"appView", IDR_APP_VIEW_JS}, |
- {"entryIdManager", IDR_ENTRY_ID_MANAGER}, |
- {kEventBindings, IDR_EVENT_BINDINGS_JS}, |
- {"extensionOptions", IDR_EXTENSION_OPTIONS_JS}, |
- {"extensionOptionsAttributes", IDR_EXTENSION_OPTIONS_ATTRIBUTES_JS}, |
- {"extensionOptionsConstants", IDR_EXTENSION_OPTIONS_CONSTANTS_JS}, |
- {"extensionOptionsEvents", IDR_EXTENSION_OPTIONS_EVENTS_JS}, |
- {"extensionView", IDR_EXTENSION_VIEW_JS}, |
- {"extensionViewApiMethods", IDR_EXTENSION_VIEW_API_METHODS_JS}, |
- {"extensionViewAttributes", IDR_EXTENSION_VIEW_ATTRIBUTES_JS}, |
- {"extensionViewConstants", IDR_EXTENSION_VIEW_CONSTANTS_JS}, |
- {"extensionViewEvents", IDR_EXTENSION_VIEW_EVENTS_JS}, |
- {"extensionViewInternal", IDR_EXTENSION_VIEW_INTERNAL_CUSTOM_BINDINGS_JS}, |
- {"guestView", IDR_GUEST_VIEW_JS}, |
- {"guestViewAttributes", IDR_GUEST_VIEW_ATTRIBUTES_JS}, |
- {"guestViewContainer", IDR_GUEST_VIEW_CONTAINER_JS}, |
- {"guestViewDeny", IDR_GUEST_VIEW_DENY_JS}, |
- {"guestViewEvents", IDR_GUEST_VIEW_EVENTS_JS}, |
- {"imageUtil", IDR_IMAGE_UTIL_JS}, |
- {"json_schema", IDR_JSON_SCHEMA_JS}, |
- {"lastError", IDR_LAST_ERROR_JS}, |
- {"messaging", IDR_MESSAGING_JS}, |
- {"messaging_utils", IDR_MESSAGING_UTILS_JS}, |
- {kSchemaUtils, IDR_SCHEMA_UTILS_JS}, |
- {"sendRequest", IDR_SEND_REQUEST_JS}, |
- {"setIcon", IDR_SET_ICON_JS}, |
- {"test", IDR_TEST_CUSTOM_BINDINGS_JS}, |
- {"test_environment_specific_bindings", |
- IDR_BROWSER_TEST_ENVIRONMENT_SPECIFIC_BINDINGS_JS}, |
- {"uncaught_exception_handler", IDR_UNCAUGHT_EXCEPTION_HANDLER_JS}, |
- {"utils", IDR_UTILS_JS}, |
- {"webRequest", IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS}, |
- {"webRequestEvent", IDR_WEB_REQUEST_EVENT_JS}, |
- {"webRequestInternal", IDR_WEB_REQUEST_INTERNAL_CUSTOM_BINDINGS_JS}, |
- // Note: webView not webview so that this doesn't interfere with the |
- // chrome.webview API bindings. |
- {"webView", IDR_WEB_VIEW_JS}, |
- {"webViewActionRequests", IDR_WEB_VIEW_ACTION_REQUESTS_JS}, |
- {"webViewApiMethods", IDR_WEB_VIEW_API_METHODS_JS}, |
- {"webViewAttributes", IDR_WEB_VIEW_ATTRIBUTES_JS}, |
- {"webViewConstants", IDR_WEB_VIEW_CONSTANTS_JS}, |
- {"webViewEvents", IDR_WEB_VIEW_EVENTS_JS}, |
- {"webViewInternal", IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS}, |
- |
- {mojo::kAssociatedBindingsModuleName, IDR_MOJO_ASSOCIATED_BINDINGS_JS}, |
- {mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS}, |
- {mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS}, |
- {mojo::kCodecModuleName, IDR_MOJO_CODEC_JS}, |
- {mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS}, |
- {mojo::kControlMessageHandlerModuleName, |
- IDR_MOJO_CONTROL_MESSAGE_HANDLER_JS}, |
- {mojo::kControlMessageProxyModuleName, IDR_MOJO_CONTROL_MESSAGE_PROXY_JS}, |
- {mojo::kInterfaceControlMessagesMojom, |
- IDR_MOJO_INTERFACE_CONTROL_MESSAGES_MOJOM_JS}, |
- {mojo::kInterfaceEndpointClientModuleName, |
- IDR_MOJO_INTERFACE_ENDPOINT_CLIENT_JS}, |
- {mojo::kInterfaceEndpointHandleModuleName, |
- IDR_MOJO_INTERFACE_ENDPOINT_HANDLE_JS}, |
- {mojo::kInterfaceTypesModuleName, IDR_MOJO_INTERFACE_TYPES_JS}, |
- {mojo::kPipeControlMessageHandlerModuleName, |
- IDR_MOJO_PIPE_CONTROL_MESSAGE_HANDLER_JS}, |
- {mojo::kPipeControlMessageProxyModuleName, |
- IDR_MOJO_PIPE_CONTROL_MESSAGE_PROXY_JS}, |
- {mojo::kPipeControlMessagesMojom, IDR_MOJO_PIPE_CONTROL_MESSAGES_MOJOM_JS}, |
- {mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS}, |
- {mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS}, |
- {mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS}, |
- {"async_waiter", IDR_ASYNC_WAITER_JS}, |
- {"keep_alive", IDR_KEEP_ALIVE_JS}, |
- {"extensions/common/mojo/keep_alive.mojom", IDR_KEEP_ALIVE_MOJOM_JS}, |
- |
- // Custom bindings. |
- {"app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS}, |
- {"app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS}, |
- {"declarativeWebRequest", IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS}, |
- {"displaySource", IDR_DISPLAY_SOURCE_CUSTOM_BINDINGS_JS}, |
- {"contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS}, |
- {"contextMenusHandlers", IDR_CONTEXT_MENUS_HANDLERS_JS}, |
- {"extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS}, |
- {"i18n", IDR_I18N_CUSTOM_BINDINGS_JS}, |
- {"mimeHandlerPrivate", IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS}, |
- {"extensions/common/api/mime_handler.mojom", IDR_MIME_HANDLER_MOJOM_JS}, |
- {"mojoPrivate", IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS}, |
- {"permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS}, |
- {"printerProvider", IDR_PRINTER_PROVIDER_CUSTOM_BINDINGS_JS}, |
- {"runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS}, |
- {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS}, |
- {"binding", IDR_BINDING_JS}, |
- |
- // Custom types sources. |
- {"StorageArea", IDR_STORAGE_AREA_JS}, |
- |
- // Platform app sources that are not API-specific.. |
- {"platformApp", IDR_PLATFORM_APP_JS}, |
+ {"appView", IDR_APP_VIEW_JS}, |
lazyboy
2017/05/20 02:18:15
I'm guessing this is git cl format?
Devlin
2017/05/23 17:17:15
Yep. :/
|
+ {"entryIdManager", IDR_ENTRY_ID_MANAGER}, |
+ {kEventBindings, IDR_EVENT_BINDINGS_JS}, |
+ {"extensionOptions", IDR_EXTENSION_OPTIONS_JS}, |
+ {"extensionOptionsAttributes", IDR_EXTENSION_OPTIONS_ATTRIBUTES_JS}, |
+ {"extensionOptionsConstants", IDR_EXTENSION_OPTIONS_CONSTANTS_JS}, |
+ {"extensionOptionsEvents", IDR_EXTENSION_OPTIONS_EVENTS_JS}, |
+ {"extensionView", IDR_EXTENSION_VIEW_JS}, |
+ {"extensionViewApiMethods", IDR_EXTENSION_VIEW_API_METHODS_JS}, |
+ {"extensionViewAttributes", IDR_EXTENSION_VIEW_ATTRIBUTES_JS}, |
+ {"extensionViewConstants", IDR_EXTENSION_VIEW_CONSTANTS_JS}, |
+ {"extensionViewEvents", IDR_EXTENSION_VIEW_EVENTS_JS}, |
+ {"extensionViewInternal", IDR_EXTENSION_VIEW_INTERNAL_CUSTOM_BINDINGS_JS}, |
+ {"fileEntryBindingUtil", IDR_FILE_ENTRY_BINDING_UTIL_JS}, |
+ {"guestView", IDR_GUEST_VIEW_JS}, |
+ {"guestViewAttributes", IDR_GUEST_VIEW_ATTRIBUTES_JS}, |
+ {"guestViewContainer", IDR_GUEST_VIEW_CONTAINER_JS}, |
+ {"guestViewDeny", IDR_GUEST_VIEW_DENY_JS}, |
+ {"guestViewEvents", IDR_GUEST_VIEW_EVENTS_JS}, |
+ {"imageUtil", IDR_IMAGE_UTIL_JS}, |
+ {"json_schema", IDR_JSON_SCHEMA_JS}, |
+ {"lastError", IDR_LAST_ERROR_JS}, |
+ {"messaging", IDR_MESSAGING_JS}, |
+ {"messaging_utils", IDR_MESSAGING_UTILS_JS}, |
+ {kSchemaUtils, IDR_SCHEMA_UTILS_JS}, |
+ {"sendRequest", IDR_SEND_REQUEST_JS}, |
+ {"setIcon", IDR_SET_ICON_JS}, |
+ {"test", IDR_TEST_CUSTOM_BINDINGS_JS}, |
+ {"test_environment_specific_bindings", |
+ IDR_BROWSER_TEST_ENVIRONMENT_SPECIFIC_BINDINGS_JS}, |
+ {"uncaught_exception_handler", IDR_UNCAUGHT_EXCEPTION_HANDLER_JS}, |
+ {"utils", IDR_UTILS_JS}, |
+ {"webRequest", IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS}, |
+ {"webRequestEvent", IDR_WEB_REQUEST_EVENT_JS}, |
+ {"webRequestInternal", IDR_WEB_REQUEST_INTERNAL_CUSTOM_BINDINGS_JS}, |
+ // Note: webView not webview so that this doesn't interfere with the |
+ // chrome.webview API bindings. |
+ {"webView", IDR_WEB_VIEW_JS}, |
+ {"webViewActionRequests", IDR_WEB_VIEW_ACTION_REQUESTS_JS}, |
+ {"webViewApiMethods", IDR_WEB_VIEW_API_METHODS_JS}, |
+ {"webViewAttributes", IDR_WEB_VIEW_ATTRIBUTES_JS}, |
+ {"webViewConstants", IDR_WEB_VIEW_CONSTANTS_JS}, |
+ {"webViewEvents", IDR_WEB_VIEW_EVENTS_JS}, |
+ {"webViewInternal", IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS}, |
+ |
+ {mojo::kAssociatedBindingsModuleName, IDR_MOJO_ASSOCIATED_BINDINGS_JS}, |
+ {mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS}, |
+ {mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS}, |
+ {mojo::kCodecModuleName, IDR_MOJO_CODEC_JS}, |
+ {mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS}, |
+ {mojo::kControlMessageHandlerModuleName, |
+ IDR_MOJO_CONTROL_MESSAGE_HANDLER_JS}, |
+ {mojo::kControlMessageProxyModuleName, IDR_MOJO_CONTROL_MESSAGE_PROXY_JS}, |
+ {mojo::kInterfaceControlMessagesMojom, |
+ IDR_MOJO_INTERFACE_CONTROL_MESSAGES_MOJOM_JS}, |
+ {mojo::kInterfaceEndpointClientModuleName, |
+ IDR_MOJO_INTERFACE_ENDPOINT_CLIENT_JS}, |
+ {mojo::kInterfaceEndpointHandleModuleName, |
+ IDR_MOJO_INTERFACE_ENDPOINT_HANDLE_JS}, |
+ {mojo::kInterfaceTypesModuleName, IDR_MOJO_INTERFACE_TYPES_JS}, |
+ {mojo::kPipeControlMessageHandlerModuleName, |
+ IDR_MOJO_PIPE_CONTROL_MESSAGE_HANDLER_JS}, |
+ {mojo::kPipeControlMessageProxyModuleName, |
+ IDR_MOJO_PIPE_CONTROL_MESSAGE_PROXY_JS}, |
+ {mojo::kPipeControlMessagesMojom, |
+ IDR_MOJO_PIPE_CONTROL_MESSAGES_MOJOM_JS}, |
+ {mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS}, |
+ {mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS}, |
+ {mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS}, |
+ {"async_waiter", IDR_ASYNC_WAITER_JS}, |
+ {"keep_alive", IDR_KEEP_ALIVE_JS}, |
+ {"extensions/common/mojo/keep_alive.mojom", IDR_KEEP_ALIVE_MOJOM_JS}, |
+ |
+ // Custom bindings. |
+ {"app.runtime", IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS}, |
+ {"app.window", IDR_APP_WINDOW_CUSTOM_BINDINGS_JS}, |
+ {"declarativeWebRequest", IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS}, |
+ {"displaySource", IDR_DISPLAY_SOURCE_CUSTOM_BINDINGS_JS}, |
+ {"contextMenus", IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS}, |
+ {"contextMenusHandlers", IDR_CONTEXT_MENUS_HANDLERS_JS}, |
+ {"extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS}, |
+ {"i18n", IDR_I18N_CUSTOM_BINDINGS_JS}, |
+ {"mimeHandlerPrivate", IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS}, |
+ {"extensions/common/api/mime_handler.mojom", IDR_MIME_HANDLER_MOJOM_JS}, |
+ {"mojoPrivate", IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS}, |
+ {"permissions", IDR_PERMISSIONS_CUSTOM_BINDINGS_JS}, |
+ {"printerProvider", IDR_PRINTER_PROVIDER_CUSTOM_BINDINGS_JS}, |
+ {"runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS}, |
+ {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS}, |
+ {"binding", IDR_BINDING_JS}, |
+ |
+ // Custom types sources. |
+ {"StorageArea", IDR_STORAGE_AREA_JS}, |
+ |
+ // Platform app sources that are not API-specific.. |
+ {"platformApp", IDR_PLATFORM_APP_JS}, |
}; |
if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) { |