| Index: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
|
| diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
|
| index 85f6930be086d78741cd1d646abad165618a6e46..d5d9b54bc8a67355e81f06930f0cdfe8d9044406 100644
|
| --- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
|
| +++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "content/public/renderer/render_frame.h"
|
| #include "content/public/renderer/render_view.h"
|
| +#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
|
| #include "extensions/common/extension_messages.h"
|
| #include "extensions/common/guest_view/guest_view_constants.h"
|
| #include "gin/arguments.h"
|
| @@ -118,16 +119,21 @@ void MimeHandlerViewContainer::DidReceiveData(const char* data,
|
| bool MimeHandlerViewContainer::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(MimeHandlerViewContainer, message)
|
| - IPC_MESSAGE_HANDLER(ExtensionMsg_CreateMimeHandlerViewGuestACK,
|
| - OnCreateMimeHandlerViewGuestACK)
|
| - IPC_MESSAGE_HANDLER(ExtensionMsg_GuestAttached, OnGuestAttached)
|
| - IPC_MESSAGE_HANDLER(ExtensionMsg_MimeHandlerViewGuestOnLoadCompleted,
|
| - OnMimeHandlerViewGuestOnLoadCompleted)
|
| - IPC_MESSAGE_UNHANDLED(handled = false)
|
| + IPC_MESSAGE_HANDLER(ExtensionMsg_CreateMimeHandlerViewGuestACK,
|
| + OnCreateMimeHandlerViewGuestACK)
|
| + IPC_MESSAGE_HANDLER(ExtensionMsg_GuestAttached, OnGuestAttached)
|
| + IPC_MESSAGE_HANDLER(ExtensionMsg_MimeHandlerViewGuestOnLoadCompleted,
|
| + OnMimeHandlerViewGuestOnLoadCompleted)
|
| + IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| }
|
|
|
| +void MimeHandlerViewContainer::OnElementResize(const gfx::Size& old_size,
|
| + const gfx::Size& new_size) {
|
| + element_size_ = new_size;
|
| +}
|
| +
|
| v8::Local<v8::Object> MimeHandlerViewContainer::V8ScriptableObject(
|
| v8::Isolate* isolate) {
|
| if (scriptable_object_.IsEmpty()) {
|
| @@ -234,9 +240,14 @@ void MimeHandlerViewContainer::CreateMimeHandlerViewGuest() {
|
| DCHECK(!stream_url.spec().empty());
|
|
|
| DCHECK_NE(element_instance_id(), guestview::kInstanceIDNone);
|
| + base::DictionaryValue create_params;
|
| + create_params.SetString(mime_handler_view::kMimeType, mime_type_);
|
| + create_params.SetString(mime_handler_view::kSrc, stream_url.spec());
|
| + create_params.SetString(mime_handler_view::kContentUrl, original_url_.spec());
|
| + create_params.SetInteger(guestview::kElementWidth, element_size_.width());
|
| + create_params.SetInteger(guestview::kElementHeight, element_size_.height());
|
| render_frame()->Send(new ExtensionHostMsg_CreateMimeHandlerViewGuest(
|
| - render_frame()->GetRoutingID(), stream_url.spec(), original_url_.spec(),
|
| - mime_type_, element_instance_id()));
|
| + render_frame()->GetRoutingID(), element_instance_id(), create_params));
|
| }
|
|
|
| } // namespace extensions
|
|
|