Skip to content

Commit

Permalink
refactor: merge CommonWebContentsDelegate into api::WebContents (#26189)
Browse files Browse the repository at this point in the history
  • Loading branch information
nornagon committed Nov 10, 2020
1 parent 0b85fdf commit ff33fa1
Show file tree
Hide file tree
Showing 9 changed files with 872 additions and 1,030 deletions.
4 changes: 0 additions & 4 deletions filenames.gni
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ filenames = {
"shell/browser/api/electron_api_web_contents_mac.mm",
"shell/browser/auto_updater_mac.mm",
"shell/browser/browser_mac.mm",
"shell/browser/common_web_contents_delegate_mac.mm",
"shell/browser/electron_browser_main_parts_mac.mm",
"shell/browser/mac/dict_util.h",
"shell/browser/mac/dict_util.mm",
Expand Down Expand Up @@ -203,7 +202,6 @@ filenames = {
"shell/browser/api/electron_api_browser_window_views.cc",
"shell/browser/api/electron_api_menu_views.cc",
"shell/browser/api/electron_api_menu_views.h",
"shell/browser/common_web_contents_delegate_views.cc",
"shell/browser/native_browser_view_views.cc",
"shell/browser/native_browser_view_views.h",
"shell/browser/native_window_views.cc",
Expand Down Expand Up @@ -336,8 +334,6 @@ filenames = {
"shell/browser/browser_process_impl.h",
"shell/browser/child_web_contents_tracker.cc",
"shell/browser/child_web_contents_tracker.h",
"shell/browser/common_web_contents_delegate.cc",
"shell/browser/common_web_contents_delegate.h",
"shell/browser/cookie_change_notifier.cc",
"shell/browser/cookie_change_notifier.h",
"shell/browser/electron_autofill_driver.cc",
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/content_browser_main_loop.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: content_browser_main_loop.patch

Pass idle quit closure for main message loop, so that pending tasks are
run before shutdown. This is required to cleanup WebContents asynchronously
in atom::CommonWebContentsDelegate::ResetManageWebContents.
in electron::api::WebContents::ResetManagedWebContents.

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index d35d26b1f572f084d5ffd25d191c62fdf5064ed4..c274bd867d5ca66f49d72eeffee5702825b4c067 100644
Expand Down

0 comments on commit ff33fa1

Please sign in to comment.