diff options
-rw-r--r-- | chrome/chrome_renderer.gypi | 6 | ||||
-rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 1 | ||||
-rw-r--r-- | chrome/renderer/extensions/dispatcher.cc | 15 | ||||
-rw-r--r-- | chrome/renderer/extensions/extension_helper.cc | 8 | ||||
-rw-r--r-- | chrome/renderer/extensions/messaging_bindings.cc (renamed from chrome/renderer/extensions/miscellaneous_bindings.cc) | 18 | ||||
-rw-r--r-- | chrome/renderer/extensions/messaging_bindings.h (renamed from chrome/renderer/extensions/miscellaneous_bindings.h) | 10 | ||||
-rw-r--r-- | chrome/renderer/resources/extensions/extension_custom_bindings.js | 10 | ||||
-rw-r--r-- | chrome/renderer/resources/extensions/messaging.js (renamed from chrome/renderer/resources/extensions/miscellaneous_bindings.js) | 20 | ||||
-rw-r--r-- | chrome/renderer/resources/extensions/runtime_custom_bindings.js | 14 | ||||
-rw-r--r-- | chrome/renderer/resources/extensions/tabs_custom_bindings.js | 12 | ||||
-rw-r--r-- | chrome/renderer/resources/renderer_resources.grd | 2 | ||||
-rw-r--r-- | chrome/test/base/chrome_render_view_test.cc | 2 |
12 files changed, 57 insertions, 61 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 5063926..75955e7 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -103,8 +103,8 @@ 'renderer/extensions/logging_native_handler.h', 'renderer/extensions/media_galleries_custom_bindings.cc', 'renderer/extensions/media_galleries_custom_bindings.h', - 'renderer/extensions/miscellaneous_bindings.cc', - 'renderer/extensions/miscellaneous_bindings.h', + 'renderer/extensions/messaging_bindings.cc', + 'renderer/extensions/messaging_bindings.h', 'renderer/extensions/module_system.cc', 'renderer/extensions/module_system.h', 'renderer/extensions/native_handler.cc', @@ -198,7 +198,7 @@ 'renderer/resources/extensions/input.ime_custom_bindings.js', 'renderer/resources/extensions/json_schema.js', 'renderer/resources/extensions/last_error.js', - 'renderer/resources/extensions/miscellaneous_bindings.js', + 'renderer/resources/extensions/messaging.js', 'renderer/resources/extensions/notifications_custom_bindings.js', 'renderer/resources/extensions/omnibox_custom_bindings.js', 'renderer/resources/extensions/page_action_custom_bindings.js', diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 603d8e1..faf742d 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -37,7 +37,6 @@ #include "chrome/renderer/extensions/chrome_v8_extension.h" #include "chrome/renderer/extensions/dispatcher.h" #include "chrome/renderer/extensions/extension_helper.h" -#include "chrome/renderer/extensions/miscellaneous_bindings.h" #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" #include "chrome/renderer/extensions/resource_request_policy.h" #include "chrome/renderer/external_extension.h" diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index 9db8cab..a4f6688 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -52,7 +52,7 @@ #include "chrome/renderer/extensions/i18n_custom_bindings.h" #include "chrome/renderer/extensions/logging_native_handler.h" #include "chrome/renderer/extensions/media_galleries_custom_bindings.h" -#include "chrome/renderer/extensions/miscellaneous_bindings.h" +#include "chrome/renderer/extensions/messaging_bindings.h" #include "chrome/renderer/extensions/module_system.h" #include "chrome/renderer/extensions/object_backed_native_handler.h" #include "chrome/renderer/extensions/page_actions_custom_bindings.h" @@ -522,7 +522,7 @@ void Dispatcher::OnDispatchOnConnect( const std::string& channel_name, const base::DictionaryValue& source_tab, const ExtensionMsg_ExternalConnectionInfo& info) { - MiscellaneousBindings::DispatchOnConnect( + MessagingBindings::DispatchOnConnect( v8_context_set_.GetAll(), target_port_id, channel_name, source_tab, info.source_id, info.target_id, info.source_url, @@ -531,7 +531,7 @@ void Dispatcher::OnDispatchOnConnect( void Dispatcher::OnDeliverMessage(int target_port_id, const std::string& message) { - MiscellaneousBindings::DeliverMessage( + MessagingBindings::DeliverMessage( v8_context_set_.GetAll(), target_port_id, message, @@ -540,7 +540,7 @@ void Dispatcher::OnDeliverMessage(int target_port_id, void Dispatcher::OnDispatchOnDisconnect(int port_id, const std::string& error_message) { - MiscellaneousBindings::DispatchOnDisconnect( + MessagingBindings::DispatchOnDisconnect( v8_context_set_.GetAll(), port_id, error_message, NULL); // All render views. @@ -804,8 +804,8 @@ void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system, ChromeV8Context* context) { module_system->RegisterNativeHandler("event_natives", scoped_ptr<NativeHandler>(EventBindings::Create(this, context))); - module_system->RegisterNativeHandler("miscellaneous_bindings_natives", - scoped_ptr<NativeHandler>(MiscellaneousBindings::Get(this, context))); + module_system->RegisterNativeHandler("messaging_natives", + scoped_ptr<NativeHandler>(MessagingBindings::Get(this, context))); module_system->RegisterNativeHandler("apiDefinitions", scoped_ptr<NativeHandler>(new ApiDefinitionsNatives(this, context))); module_system->RegisterNativeHandler("sendRequest", @@ -886,8 +886,7 @@ void Dispatcher::PopulateSourceMap() { source_map_.RegisterSource("imageUtil", IDR_IMAGE_UTIL_JS); source_map_.RegisterSource("json_schema", IDR_JSON_SCHEMA_JS); source_map_.RegisterSource("lastError", IDR_LAST_ERROR_JS); - source_map_.RegisterSource("miscellaneous_bindings", - IDR_MISCELLANEOUS_BINDINGS_JS); + source_map_.RegisterSource("messaging", IDR_MESSAGING_JS); source_map_.RegisterSource("schemaUtils", IDR_SCHEMA_UTILS_JS); source_map_.RegisterSource("sendRequest", IDR_SEND_REQUEST_JS); source_map_.RegisterSource("setIcon", IDR_SET_ICON_JS); diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index c4930ff..cfdbd8f 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -18,7 +18,7 @@ #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/console.h" #include "chrome/renderer/extensions/dispatcher.h" -#include "chrome/renderer/extensions/miscellaneous_bindings.h" +#include "chrome/renderer/extensions/messaging_bindings.h" #include "chrome/renderer/extensions/user_script_scheduler.h" #include "chrome/renderer/extensions/user_script_slave.h" #include "chrome/renderer/web_apps.h" @@ -264,7 +264,7 @@ void ExtensionHelper::OnExtensionDispatchOnConnect( const std::string& channel_name, const base::DictionaryValue& source_tab, const ExtensionMsg_ExternalConnectionInfo& info) { - MiscellaneousBindings::DispatchOnConnect( + MessagingBindings::DispatchOnConnect( dispatcher_->v8_context_set().GetAll(), target_port_id, channel_name, source_tab, info.source_id, info.target_id, info.source_url, @@ -273,7 +273,7 @@ void ExtensionHelper::OnExtensionDispatchOnConnect( void ExtensionHelper::OnExtensionDeliverMessage(int target_id, const std::string& message) { - MiscellaneousBindings::DeliverMessage(dispatcher_->v8_context_set().GetAll(), + MessagingBindings::DeliverMessage(dispatcher_->v8_context_set().GetAll(), target_id, message, render_view()); @@ -282,7 +282,7 @@ void ExtensionHelper::OnExtensionDeliverMessage(int target_id, void ExtensionHelper::OnExtensionDispatchOnDisconnect( int port_id, const std::string& error_message) { - MiscellaneousBindings::DispatchOnDisconnect( + MessagingBindings::DispatchOnDisconnect( dispatcher_->v8_context_set().GetAll(), port_id, error_message, render_view()); diff --git a/chrome/renderer/extensions/miscellaneous_bindings.cc b/chrome/renderer/extensions/messaging_bindings.cc index 004aaa3..a4c0d99 100644 --- a/chrome/renderer/extensions/miscellaneous_bindings.cc +++ b/chrome/renderer/extensions/messaging_bindings.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/extensions/miscellaneous_bindings.h" +#include "chrome/renderer/extensions/messaging_bindings.h" #include <map> #include <string> @@ -218,14 +218,14 @@ class ExtensionImpl : public extensions::ChromeV8Extension { namespace extensions { -ChromeV8Extension* MiscellaneousBindings::Get( +ChromeV8Extension* MessagingBindings::Get( Dispatcher* dispatcher, ChromeV8Context* context) { return new ExtensionImpl(dispatcher, context); } // static -void MiscellaneousBindings::DispatchOnConnect( +void MessagingBindings::DispatchOnConnect( const ChromeV8ContextSet::ContextSet& contexts, int target_port_id, const std::string& channel_name, @@ -267,7 +267,7 @@ void MiscellaneousBindings::DispatchOnConnect( }; v8::Handle<v8::Value> retval = (*it)->module_system()->CallModuleMethod( - "miscellaneous_bindings", + "messaging", "dispatchOnConnect", arraysize(arguments), arguments); @@ -290,7 +290,7 @@ void MiscellaneousBindings::DispatchOnConnect( } // static -void MiscellaneousBindings::DeliverMessage( +void MessagingBindings::DeliverMessage( const ChromeV8ContextSet::ContextSet& contexts, int target_port_id, const std::string& message, @@ -313,7 +313,7 @@ void MiscellaneousBindings::DeliverMessage( // the message. v8::Handle<v8::Value> port_id_handle = v8::Integer::New(target_port_id); v8::Handle<v8::Value> has_port = (*it)->module_system()->CallModuleMethod( - "miscellaneous_bindings", + "messaging", "hasPort", 1, &port_id_handle); @@ -324,14 +324,14 @@ void MiscellaneousBindings::DeliverMessage( std::vector<v8::Handle<v8::Value> > arguments; arguments.push_back(v8::String::New(message.c_str(), message.size())); arguments.push_back(port_id_handle); - (*it)->module_system()->CallModuleMethod("miscellaneous_bindings", + (*it)->module_system()->CallModuleMethod("messaging", "dispatchOnMessage", &arguments); } } // static -void MiscellaneousBindings::DispatchOnDisconnect( +void MessagingBindings::DispatchOnDisconnect( const ChromeV8ContextSet::ContextSet& contexts, int port_id, const std::string& error_message, @@ -357,7 +357,7 @@ void MiscellaneousBindings::DispatchOnDisconnect( } else { arguments.push_back(v8::Null()); } - (*it)->module_system()->CallModuleMethod("miscellaneous_bindings", + (*it)->module_system()->CallModuleMethod("messaging", "dispatchOnDisconnect", &arguments); } diff --git a/chrome/renderer/extensions/miscellaneous_bindings.h b/chrome/renderer/extensions/messaging_bindings.h index 79dfeb7..811bc77 100644 --- a/chrome/renderer/extensions/miscellaneous_bindings.h +++ b/chrome/renderer/extensions/messaging_bindings.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_EXTENSIONS_MISCELLANEOUS_BINDINGS_H_ -#define CHROME_RENDERER_EXTENSIONS_MISCELLANEOUS_BINDINGS_H_ +#ifndef CHROME_RENDERER_EXTENSIONS_MESSAGING_BINDINGS_H_ +#define CHROME_RENDERER_EXTENSIONS_MESSAGING_BINDINGS_H_ #include <string> @@ -25,12 +25,12 @@ namespace extensions { class ChromeV8Extension; class Dispatcher; -// Manually implements some random JavaScript bindings for the extension system. +// Manually implements JavaScript bindings for extension messaging. // // TODO(aa): This should all get re-implemented using SchemaGeneratedBindings. // If anything needs to be manual for some reason, it should be implemented in // its own class. -class MiscellaneousBindings { +class MessagingBindings { public: // Creates an instance of the extension. static ChromeV8Extension* Get(Dispatcher* dispatcher, @@ -68,4 +68,4 @@ class MiscellaneousBindings { } // namespace extensions -#endif // CHROME_RENDERER_EXTENSIONS_MISCELLANEOUS_BINDINGS_H_ +#endif // CHROME_RENDERER_EXTENSIONS_MESSAGING_BINDINGS_H_ diff --git a/chrome/renderer/resources/extensions/extension_custom_bindings.js b/chrome/renderer/resources/extensions/extension_custom_bindings.js index 3326e9b..84ab647 100644 --- a/chrome/renderer/resources/extensions/extension_custom_bindings.js +++ b/chrome/renderer/resources/extensions/extension_custom_bindings.js @@ -8,7 +8,7 @@ var binding = require('binding').Binding.create('extension'); var extensionNatives = requireNative('extension'); var GetExtensionViews = extensionNatives.GetExtensionViews; -var miscBindings = require('miscellaneous_bindings'); +var messaging = require('messaging'); var runtimeNatives = requireNative('runtime'); var OpenChannelToExtension = runtimeNatives.OpenChannelToExtension; var OpenChannelToNativeApp = runtimeNatives.OpenChannelToNativeApp; @@ -87,16 +87,16 @@ binding.registerCustomHook(function(bindingsAPI, extensionId) { }); apiFunctions.setUpdateArgumentsPreValidate('sendRequest', - $Function.bind(miscBindings.sendMessageUpdateArguments, - null, 'sendRequest')); + $Function.bind(messaging.sendMessageUpdateArguments, + null, 'sendRequest')); apiFunctions.setHandleRequest('sendRequest', function(targetId, request, responseCallback) { if (sendRequestIsDisabled) throw new Error(sendRequestIsDisabled); var port = chrome.runtime.connect(targetId || extensionId, - {name: miscBindings.kRequestChannel}); - miscBindings.sendMessageImpl(port, request, responseCallback); + {name: messaging.kRequestChannel}); + messaging.sendMessageImpl(port, request, responseCallback); }); if (sendRequestIsDisabled) { diff --git a/chrome/renderer/resources/extensions/miscellaneous_bindings.js b/chrome/renderer/resources/extensions/messaging.js index 1116d29..78d4503 100644 --- a/chrome/renderer/resources/extensions/miscellaneous_bindings.js +++ b/chrome/renderer/resources/extensions/messaging.js @@ -12,7 +12,7 @@ var Event = require('event_bindings').Event; var lastError = require('lastError'); var logActivity = requireNative('activityLogger'); - var miscNatives = requireNative('miscellaneous_bindings_natives'); + var messagingNatives = requireNative('messaging_natives'); var processNatives = requireNative('process'); var unloadEvent = require('unload_event'); @@ -66,12 +66,12 @@ console.error('Illegal argument to Port.postMessage'); return; } - miscNatives.PostMessage(this.portId_, msg); + messagingNatives.PostMessage(this.portId_, msg); }; // Disconnects the port from the other end. Port.prototype.disconnect = function() { - miscNatives.CloseChannel(this.portId_, true); + messagingNatives.CloseChannel(this.portId_, true); this.destroy_(); }; @@ -81,7 +81,7 @@ this.onDisconnect.destroy_(); this.onMessage.destroy_(); - miscNatives.PortRelease(portId); + messagingNatives.PortRelease(portId); unloadEvent.removeListener(portReleasers[portId]); delete ports[portId]; @@ -102,11 +102,11 @@ throw new Error("Port '" + portId + "' already exists."); var port = new Port(portId, opt_name); ports[portId] = port; - portReleasers[portId] = $Function.bind(miscNatives.PortRelease, - this, - portId); + portReleasers[portId] = $Function.bind(messagingNatives.PortRelease, + this, + portId); unloadEvent.addListener(portReleasers[portId]); - miscNatives.PortAddRef(portId); + messagingNatives.PortAddRef(portId); return port; }; @@ -175,7 +175,7 @@ // doesn't keep a reference to it, we need to clean up the port. Do // so by attaching to the garbage collection of the responseCallback // using some native hackery. - miscNatives.BindToGC(responseCallback, function() { + messagingNatives.BindToGC(responseCallback, function() { if (port) { port.destroy_(); port = null; @@ -272,7 +272,7 @@ var port = ports[portId]; if (port) { // Update the renderer's port bookkeeping, without notifying the browser. - miscNatives.CloseChannel(portId, false); + messagingNatives.CloseChannel(portId, false); if (errorMessage) lastError.set('Port', errorMessage, null, chrome); try { diff --git a/chrome/renderer/resources/extensions/runtime_custom_bindings.js b/chrome/renderer/resources/extensions/runtime_custom_bindings.js index ec444c9..04bf257 100644 --- a/chrome/renderer/resources/extensions/runtime_custom_bindings.js +++ b/chrome/renderer/resources/extensions/runtime_custom_bindings.js @@ -7,7 +7,7 @@ var binding = require('binding').Binding.create('runtime'); var extensionNatives = requireNative('extension'); -var miscBindings = require('miscellaneous_bindings'); +var messaging = require('messaging'); var runtimeNatives = requireNative('runtime'); var unloadEvent = require('unload_event'); var process = requireNative('process'); @@ -96,7 +96,7 @@ binding.registerCustomHook(function(binding, id, contextType) { return 'chrome-extension://' + id + path; }); - var sendMessageUpdateArguments = miscBindings.sendMessageUpdateArguments; + var sendMessageUpdateArguments = messaging.sendMessageUpdateArguments; apiFunctions.setUpdateArgumentsPreValidate('sendMessage', $Function.bind(sendMessageUpdateArguments, null, 'sendMessage')); apiFunctions.setUpdateArgumentsPreValidate('sendNativeMessage', @@ -105,14 +105,14 @@ binding.registerCustomHook(function(binding, id, contextType) { apiFunctions.setHandleRequest('sendMessage', function(targetId, message, responseCallback) { var port = runtime.connect(targetId || runtime.id, - {name: miscBindings.kMessageChannel}); - miscBindings.sendMessageImpl(port, message, responseCallback); + {name: messaging.kMessageChannel}); + messaging.sendMessageImpl(port, message, responseCallback); }); apiFunctions.setHandleRequest('sendNativeMessage', function(targetId, message, responseCallback) { var port = runtime.connectNative(targetId); - miscBindings.sendMessageImpl(port, message, responseCallback); + messaging.sendMessageImpl(port, message, responseCallback); }); apiFunctions.setUpdateArgumentsPreValidate('connect', function() { @@ -160,7 +160,7 @@ binding.registerCustomHook(function(binding, id, contextType) { var portId = runtimeNatives.OpenChannelToExtension(targetId, name); if (portId >= 0) - return miscBindings.createPort(portId, name); + return messaging.createPort(portId, name); }); // @@ -175,7 +175,7 @@ binding.registerCustomHook(function(binding, id, contextType) { var portId = runtimeNatives.OpenChannelToNativeApp(runtime.id, nativeAppName); if (portId >= 0) - return miscBindings.createPort(portId, ''); + return messaging.createPort(portId, ''); } throw new Error('Error connecting to native app: ' + nativeAppName); }); diff --git a/chrome/renderer/resources/extensions/tabs_custom_bindings.js b/chrome/renderer/resources/extensions/tabs_custom_bindings.js index bd2086c..b650146 100644 --- a/chrome/renderer/resources/extensions/tabs_custom_bindings.js +++ b/chrome/renderer/resources/extensions/tabs_custom_bindings.js @@ -6,7 +6,7 @@ var binding = require('binding').Binding.create('tabs'); -var miscBindings = require('miscellaneous_bindings'); +var messaging = require('messaging'); var tabsNatives = requireNative('tabs'); var OpenChannelToTab = tabsNatives.OpenChannelToTab; var sendRequestIsDisabled = requireNative('process').IsSendRequestDisabled(); @@ -21,21 +21,21 @@ binding.registerCustomHook(function(bindingsAPI, extensionId) { name = connectInfo.name || name; } var portId = OpenChannelToTab(tabId, extensionId, name); - return miscBindings.createPort(portId, name); + return messaging.createPort(portId, name); }); apiFunctions.setHandleRequest('sendRequest', function(tabId, request, responseCallback) { if (sendRequestIsDisabled) throw new Error(sendRequestIsDisabled); - var port = tabs.connect(tabId, {name: miscBindings.kRequestChannel}); - miscBindings.sendMessageImpl(port, request, responseCallback); + var port = tabs.connect(tabId, {name: messaging.kRequestChannel}); + messaging.sendMessageImpl(port, request, responseCallback); }); apiFunctions.setHandleRequest('sendMessage', function(tabId, message, responseCallback) { - var port = tabs.connect(tabId, {name: miscBindings.kMessageChannel}); - miscBindings.sendMessageImpl(port, message, responseCallback); + var port = tabs.connect(tabId, {name: messaging.kMessageChannel}); + messaging.sendMessageImpl(port, message, responseCallback); }); }); diff --git a/chrome/renderer/resources/renderer_resources.grd b/chrome/renderer/resources/renderer_resources.grd index 5a2a416..17f62e8 100644 --- a/chrome/renderer/resources/renderer_resources.grd +++ b/chrome/renderer/resources/renderer_resources.grd @@ -34,7 +34,7 @@ without changes to the corresponding grd file. fb9 --> <include name="IDR_IMAGE_UTIL_JS" file="extensions\image_util.js" type="BINDATA" /> <include name="IDR_JSON_SCHEMA_JS" file="extensions\json_schema.js" type="BINDATA" /> <include name="IDR_LAST_ERROR_JS" file="extensions\last_error.js" type="BINDATA" /> - <include name="IDR_MISCELLANEOUS_BINDINGS_JS" file="extensions\miscellaneous_bindings.js" type="BINDATA" /> + <include name="IDR_MESSAGING_JS" file="extensions\messaging.js" type="BINDATA" /> <include name="IDR_SCHEMA_UTILS_JS" file="extensions\schema_utils.js" type="BINDATA" /> <include name="IDR_SEARCHBOX_API" file="extensions\searchbox_api.js" type="BINDATA" /> <include name="IDR_SEND_REQUEST_JS" file="extensions\send_request.js" type="BINDATA" /> diff --git a/chrome/test/base/chrome_render_view_test.cc b/chrome/test/base/chrome_render_view_test.cc index c776009..665590a 100644 --- a/chrome/test/base/chrome_render_view_test.cc +++ b/chrome/test/base/chrome_render_view_test.cc @@ -13,7 +13,6 @@ #include "chrome/renderer/extensions/dispatcher.h" #include "chrome/renderer/extensions/event_bindings.h" #include "chrome/renderer/extensions/extension_custom_bindings.h" -#include "chrome/renderer/extensions/miscellaneous_bindings.h" #include "chrome/renderer/spellchecker/spellcheck.h" #include "components/autofill/content/renderer/password_autofill_agent.h" #include "content/public/browser/native_web_keyboard_event.h" @@ -34,7 +33,6 @@ #endif using extensions::ExtensionCustomBindings; -using extensions::MiscellaneousBindings; using WebKit::WebFrame; using WebKit::WebInputEvent; using WebKit::WebMouseEvent; |