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

Conversation

Projects
None yet
3 participants
@alexeykuzmin
Contributor

alexeykuzmin commented Apr 27, 2018

#11933 to 1-8-x

@alexeykuzmin alexeykuzmin requested review from ckerr and nitsakh Apr 27, 2018

@alexeykuzmin alexeykuzmin requested a review from electron/reviewers as a code owner Apr 27, 2018

@alexeykuzmin

This comment has been minimized.

Contributor

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
@nitsakh

👍

@ckerr ckerr merged commit d8b4148 into 1-8-x May 1, 2018

9 checks passed

WIP ready for review
Details
ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-mips64el Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-mas-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-osx-x64 Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@ckerr ckerr deleted the 1-8-x_fix-contextmenu-sb branch May 1, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment