Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix context menu for sandbox devtools (#11933) #12734

Merged
merged 1 commit into from
May 1, 2018
Merged

Conversation

alexeykuzmin
Copy link
Contributor

#11933 to 1-8-x

@alexeykuzmin alexeykuzmin requested review from ckerr, nitsakh and a team April 27, 2018 13:51
@alexeykuzmin
Copy link
Contributor Author

alexeykuzmin commented Apr 27, 2018

@nitsakh Can you please review it?
I got conflicts chert-picking it to 1-8-x, and had to remove this piece:

-  // Only allow preload for the main frame
-  if (!render_frame->IsMainFrame())
+  // Only allow preload for the main frame or
+  // For devtools we still want to run the preload_bundle script
+  if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))
     return;

Because these lines are absent in 1-8-x:

if (!render_frame->IsMainFrame())
  return

@alexeykuzmin alexeykuzmin force-pushed the 1-8-x_fix-contextmenu-sb branch from b703290 to 044d130 Compare April 30, 2018 10:25
Copy link
Contributor

@nitsakh nitsakh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ckerr ckerr merged commit d8b4148 into 1-8-x May 1, 2018
@ckerr ckerr deleted the 1-8-x_fix-contextmenu-sb branch May 1, 2018 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants