| Index: extensions/renderer/dispatcher.cc
|
| diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
|
| index 55a9b14a508f7ca98f2a9a659276b94d23ada2b1..e65893c7b0baacd6f6eee19c2966bb58a75a8365 100644
|
| --- a/extensions/renderer/dispatcher.cc
|
| +++ b/extensions/renderer/dispatcher.cc
|
| @@ -97,6 +97,8 @@
|
| #include "ui/base/layout.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "v8/include/v8.h"
|
| +#include "extensions/common/guest_view/guest_view_messages.h"
|
| +#include "extensions/renderer/guest_view/extensions_guest_view_container.h"
|
|
|
| using base::UserMetricsAction;
|
| using blink::WebDataSource;
|
| @@ -738,6 +740,8 @@ bool Dispatcher::OnControlMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(ExtensionMsg_ClearTabSpecificPermissions,
|
| OnClearTabSpecificPermissions)
|
| IPC_MESSAGE_HANDLER(ExtensionMsg_UsingWebRequestAPI, OnUsingWebRequestAPI)
|
| + IPC_MESSAGE_HANDLER_GENERIC(GuestViewMsg_ContentWindowReady,
|
| + OnGuestContentWindowReady(message))
|
| IPC_MESSAGE_FORWARD(ExtensionMsg_WatchPages,
|
| content_watcher_.get(),
|
| ContentWatcher::OnWatchPages)
|
| @@ -1062,6 +1066,18 @@ void Dispatcher::OnUsingWebRequestAPI(bool webrequest_used) {
|
| webrequest_used_ = webrequest_used;
|
| }
|
|
|
| +void Dispatcher::OnGuestContentWindowReady(const IPC::Message& message) {
|
| + GuestViewMsg_ContentWindowReady::Param param;
|
| + bool read_status = GuestViewMsg_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();
|
|
|