Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(702)

Unified Diff: components/guest_view/renderer/guest_view_request.cc

Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame. (Closed)
Patch Set: Rebasing... Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/dom_automation_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/guest_view/renderer/guest_view_request.cc
diff --git a/components/guest_view/renderer/guest_view_request.cc b/components/guest_view/renderer/guest_view_request.cc
index ea96bc9b3c73c4094ece473c478d151abd856000..b9be45503d6114dbb5a0bab1669a27df897437d7 100644
--- a/components/guest_view/renderer/guest_view_request.cc
+++ b/components/guest_view/renderer/guest_view_request.cc
@@ -91,14 +91,7 @@ void GuestViewAttachRequest::HandleResponse(const IPC::Message& message) {
v8::HandleScope handle_scope(isolate());
blink::WebFrame* frame = guest_proxy_render_view->GetWebView()->MainFrame();
- // TODO(lazyboy,nasko): The WebLocalFrame branch is not used when running
- // on top of out-of-process iframes. Remove it once the code is converted.
- v8::Local<v8::Value> window;
- if (frame->IsWebLocalFrame()) {
- window = frame->MainWorldScriptContext()->Global();
- } else {
- window = frame->ToWebRemoteFrame()->GlobalProxy();
- }
+ v8::Local<v8::Value> window = frame->GlobalProxy();
const int argc = 1;
std::unique_ptr<v8::Local<v8::Value>[]> argv(new v8::Local<v8::Value>[argc]);
« no previous file with comments | « no previous file | content/renderer/dom_automation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698