| Index: chrome/renderer/extensions/extension_helper.cc
|
| diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
|
| index ac456a84395273e9c1590fefebba6258fc791b7c..ba6e972488220059d825b1b8cc6fc7251d1bf397 100644
|
| --- a/chrome/renderer/extensions/extension_helper.cc
|
| +++ b/chrome/renderer/extensions/extension_helper.cc
|
| @@ -33,10 +33,6 @@
|
| #include "webkit/glue/image_resource_fetcher.h"
|
| #include "webkit/glue/resource_fetcher.h"
|
|
|
| -namespace base {
|
| -class ListValue;
|
| -} // namespace base
|
| -
|
| using content::ConsoleMessageLevel;
|
| using WebKit::WebConsoleMessage;
|
| using WebKit::WebDataSource;
|
| @@ -280,13 +276,12 @@ void ExtensionHelper::OnExtensionMessageInvoke(const std::string& extension_id,
|
| void ExtensionHelper::OnExtensionDispatchOnConnect(
|
| int target_port_id,
|
| const std::string& channel_name,
|
| - const std::string& tab_json,
|
| - const std::string& source_extension_id,
|
| - const std::string& target_extension_id) {
|
| + const base::DictionaryValue& source_tab,
|
| + const ExtensionMsg_ExternalConnectionInfo& info) {
|
| MiscellaneousBindings::DispatchOnConnect(
|
| dispatcher_->v8_context_set().GetAll(),
|
| - target_port_id, channel_name, tab_json,
|
| - source_extension_id, target_extension_id,
|
| + target_port_id, channel_name, source_tab,
|
| + info.source_id, info.target_id, info.source_url,
|
| render_view());
|
| }
|
|
|
|
|