Index: extensions/renderer/dispatcher.cc |
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc |
index e2821a947da2e234a6921fd270426d3e10bec177..dfc60c7c91be9f2455d033959c2c8ac0582f9774 100644 |
--- a/extensions/renderer/dispatcher.cc |
+++ b/extensions/renderer/dispatcher.cc |
@@ -30,6 +30,7 @@ |
#include "extensions/common/feature_switch.h" |
#include "extensions/common/features/feature.h" |
#include "extensions/common/features/feature_provider.h" |
+#include "extensions/common/guest_view/extensions_guest_view_messages.h" |
#include "extensions/common/manifest.h" |
#include "extensions/common/manifest_constants.h" |
#include "extensions/common/manifest_handlers/background_info.h" |
@@ -57,6 +58,7 @@ |
#include "extensions/renderer/extension_helper.h" |
#include "extensions/renderer/extensions_renderer_client.h" |
#include "extensions/renderer/file_system_natives.h" |
+#include "extensions/renderer/guest_view/extensions_guest_view_container.h" |
#include "extensions/renderer/guest_view/guest_view_internal_custom_bindings.h" |
#include "extensions/renderer/i18n_custom_bindings.h" |
#include "extensions/renderer/id_generator_custom_bindings.h" |
@@ -710,6 +712,8 @@ bool Dispatcher::OnControlMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(ExtensionMsg_ClearTabSpecificPermissions, |
OnClearTabSpecificPermissions) |
IPC_MESSAGE_HANDLER(ExtensionMsg_UsingWebRequestAPI, OnUsingWebRequestAPI) |
+ IPC_MESSAGE_HANDLER_GENERIC(ExtensionsGuestViewMsg_ContentWindowReady, |
+ OnGuestContentWindowReady(message)) |
IPC_MESSAGE_FORWARD(ExtensionMsg_WatchPages, |
content_watcher_.get(), |
ContentWatcher::OnWatchPages) |
@@ -1034,6 +1038,19 @@ void Dispatcher::OnUsingWebRequestAPI(bool webrequest_used) { |
webrequest_used_ = webrequest_used; |
} |
+void Dispatcher::OnGuestContentWindowReady(const IPC::Message& message) { |
+ ExtensionsGuestViewMsg_ContentWindowReady::Param param; |
Fady Samuel
2015/04/28 17:56:11
This should be in ExtensionsGuestViewContainer...
|
+ bool read_status = |
+ ExtensionsGuestViewMsg_ContentWindowReady::Read(&message, ¶m); |
+ DCHECK(read_status); |
+ int element_instance_id = get<0>(param); |
+ ExtensionsGuestViewContainer* container = |
+ ExtensionsGuestViewContainer::FromID( |
+ element_instance_id); |
+ DCHECK(container); |
+ container->OnMessageReceived(message); |
+} |
+ |
void Dispatcher::OnUserScriptsUpdated(const std::set<HostID>& changed_hosts, |
const std::vector<UserScript*>& scripts) { |
UpdateActiveExtensions(); |