| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/renderer/dispatcher.h" | 5 #include "extensions/renderer/dispatcher.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 993 | 993 |
| 994 UpdateActiveExtensions(); | 994 UpdateActiveExtensions(); |
| 995 } | 995 } |
| 996 | 996 |
| 997 void Dispatcher::OnCancelSuspend(const std::string& extension_id) { | 997 void Dispatcher::OnCancelSuspend(const std::string& extension_id) { |
| 998 DispatchEvent(extension_id, kOnSuspendCanceledEvent, base::ListValue(), | 998 DispatchEvent(extension_id, kOnSuspendCanceledEvent, base::ListValue(), |
| 999 base::DictionaryValue()); | 999 base::DictionaryValue()); |
| 1000 } | 1000 } |
| 1001 | 1001 |
| 1002 void Dispatcher::OnDeliverMessage(int target_port_id, | 1002 void Dispatcher::OnDeliverMessage(int target_port_id, |
| 1003 int source_tab_id, | |
| 1004 const Message& message) { | 1003 const Message& message) { |
| 1005 MessagingBindings::DeliverMessage(*script_context_set_, target_port_id, | 1004 MessagingBindings::DeliverMessage(*script_context_set_, target_port_id, |
| 1006 message, | 1005 message, |
| 1007 NULL); // All render frames. | 1006 NULL); // All render frames. |
| 1008 } | 1007 } |
| 1009 | 1008 |
| 1010 void Dispatcher::OnDispatchOnConnect( | 1009 void Dispatcher::OnDispatchOnConnect( |
| 1011 int target_port_id, | 1010 int target_port_id, |
| 1012 const std::string& channel_name, | 1011 const std::string& channel_name, |
| 1013 const ExtensionMsg_TabConnectionInfo& source, | 1012 const ExtensionMsg_TabConnectionInfo& source, |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1466 // The "guestViewDeny" module must always be loaded last. It registers | 1465 // The "guestViewDeny" module must always be loaded last. It registers |
| 1467 // error-providing custom elements for the GuestView types that are not | 1466 // error-providing custom elements for the GuestView types that are not |
| 1468 // available, and thus all of those types must have been checked and loaded | 1467 // available, and thus all of those types must have been checked and loaded |
| 1469 // (or not loaded) beforehand. | 1468 // (or not loaded) beforehand. |
| 1470 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { | 1469 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { |
| 1471 module_system->Require("guestViewDeny"); | 1470 module_system->Require("guestViewDeny"); |
| 1472 } | 1471 } |
| 1473 } | 1472 } |
| 1474 | 1473 |
| 1475 } // namespace extensions | 1474 } // namespace extensions |
| OLD | NEW |