Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/extension_message_service.h" | 5 #include "chrome/browser/extensions/extension_message_service.h" |
| 6 | 6 |
| 7 #include "base/atomic_sequence_num.h" | 7 #include "base/atomic_sequence_num.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 args.Set(0, Value::CreateIntegerValue(dest_port_id)); | 70 args.Set(0, Value::CreateIntegerValue(dest_port_id)); |
| 71 args.Set(1, Value::CreateStringValue(channel_name)); | 71 args.Set(1, Value::CreateStringValue(channel_name)); |
| 72 args.Set(2, Value::CreateStringValue(tab_json)); | 72 args.Set(2, Value::CreateStringValue(tab_json)); |
| 73 args.Set(3, Value::CreateStringValue(source_extension_id)); | 73 args.Set(3, Value::CreateStringValue(source_extension_id)); |
| 74 args.Set(4, Value::CreateStringValue(target_extension_id)); | 74 args.Set(4, Value::CreateStringValue(target_extension_id)); |
| 75 CHECK(port.sender); | 75 CHECK(port.sender); |
| 76 port.sender->Send( | 76 port.sender->Send( |
| 77 new ExtensionMsg_MessageInvoke( | 77 new ExtensionMsg_MessageInvoke( |
| 78 port.routing_id, | 78 port.routing_id, |
| 79 target_extension_id, | 79 target_extension_id, |
| 80 ExtensionMessageService::kDispatchOnConnect, args, GURL())); | 80 ExtensionMessageService::kDispatchOnConnect, args, GURL(), false)); |
|
Aaron Boodman
2012/02/29 01:20:37
In these cases where you have to use a boolean con
Greg Billock
2012/02/29 17:58:08
Good call. Done.
On 2012/02/29 01:20:37, Aaron Bo
| |
| 81 } | 81 } |
| 82 | 82 |
| 83 static void DispatchOnDisconnect( | 83 static void DispatchOnDisconnect( |
| 84 const ExtensionMessageService::MessagePort& port, int source_port_id, | 84 const ExtensionMessageService::MessagePort& port, int source_port_id, |
| 85 bool connection_error) { | 85 bool connection_error) { |
| 86 ListValue args; | 86 ListValue args; |
| 87 args.Set(0, Value::CreateIntegerValue(source_port_id)); | 87 args.Set(0, Value::CreateIntegerValue(source_port_id)); |
| 88 args.Set(1, Value::CreateBooleanValue(connection_error)); | 88 args.Set(1, Value::CreateBooleanValue(connection_error)); |
| 89 port.sender->Send(new ExtensionMsg_MessageInvoke(port.routing_id, | 89 port.sender->Send(new ExtensionMsg_MessageInvoke(port.routing_id, |
| 90 "", ExtensionMessageService::kDispatchOnDisconnect, args, GURL())); | 90 "", ExtensionMessageService::kDispatchOnDisconnect, args, GURL(), false)); |
| 91 } | 91 } |
| 92 | 92 |
| 93 static void DispatchOnMessage(const ExtensionMessageService::MessagePort& port, | 93 static void DispatchOnMessage(const ExtensionMessageService::MessagePort& port, |
| 94 const std::string& message, int target_port_id) { | 94 const std::string& message, int target_port_id) { |
| 95 port.sender->Send( | 95 port.sender->Send( |
| 96 new ExtensionMsg_DeliverMessage( | 96 new ExtensionMsg_DeliverMessage( |
| 97 port.routing_id, target_port_id, message)); | 97 port.routing_id, target_port_id, message)); |
| 98 } | 98 } |
| 99 | 99 |
| 100 static content::RenderProcessHost* GetExtensionProcess(Profile* profile, | 100 static content::RenderProcessHost* GetExtensionProcess(Profile* profile, |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 378 | 378 |
| 379 if (current->second->opener.sender == sender) { | 379 if (current->second->opener.sender == sender) { |
| 380 CloseChannelImpl(current, GET_CHANNEL_OPENER_ID(current->first), | 380 CloseChannelImpl(current, GET_CHANNEL_OPENER_ID(current->first), |
| 381 notify_other_port); | 381 notify_other_port); |
| 382 } else if (current->second->receiver.sender == sender) { | 382 } else if (current->second->receiver.sender == sender) { |
| 383 CloseChannelImpl(current, GET_CHANNEL_RECEIVERS_ID(current->first), | 383 CloseChannelImpl(current, GET_CHANNEL_RECEIVERS_ID(current->first), |
| 384 notify_other_port); | 384 notify_other_port); |
| 385 } | 385 } |
| 386 } | 386 } |
| 387 } | 387 } |
| OLD | NEW |