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 c27ded7fa9bb86d6cdbeab43c28935b32d30aca1..7fa6b1a20db62f3159e668e6e7a76eb17bcdbd8a 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 |
@@ -238,12 +238,7 @@ void MimeHandlerViewContainer::PostMessage(v8::Isolate* isolate, |
// TODO(lazyboy,nasko): The WebLocalFrame branch is not used when running |
lfg
2017/06/09 18:53:14
Please remove the comment.
Łukasz Anforowicz
2017/06/09 18:56:26
Ooops. Done.
|
// on top of out-of-process iframes. Remove it once the code is converted. |
- v8::Local<v8::Object> guest_proxy_window; |
- if (guest_proxy_frame->IsWebLocalFrame()) { |
- guest_proxy_window = guest_proxy_frame->MainWorldScriptContext()->Global(); |
- } else { |
- guest_proxy_window = guest_proxy_frame->ToWebRemoteFrame()->GlobalProxy(); |
- } |
+ v8::Local<v8::Object> guest_proxy_window = guest_proxy_frame->GlobalProxy(); |
gin::Dictionary window_object(isolate, guest_proxy_window); |
v8::Local<v8::Function> post_message; |
if (!window_object.Get(std::string(kPostMessageName), &post_message)) |
@@ -261,7 +256,7 @@ void MimeHandlerViewContainer::PostMessage(v8::Isolate* isolate, |
void MimeHandlerViewContainer::PostMessageFromValue( |
const base::Value& message) { |
- blink::WebFrame* frame = render_frame()->GetWebFrame(); |
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); |
if (!frame) |
return; |
@@ -302,7 +297,7 @@ void MimeHandlerViewContainer::OnMimeHandlerViewGuestOnLoadCompleted( |
return; |
// Now that the guest has loaded, flush any unsent messages. |
- blink::WebFrame* frame = render_frame()->GetWebFrame(); |
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); |
if (!frame) |
return; |