diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index afa56e819..e0493bd0c 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/90.0.4430.0' + 'chromium_checkout': 'refs/tags/90.0.4430.30', + 'depot_tools_checkout': '9757ad5883' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 52c6f55a1..4919a77a0 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -1,8 +1,8 @@ diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc -index 52ebdbbc7c2e..822f2e41afec 100644 +index a91e7c720acc..f0534e67f723 100644 --- content/browser/child_process_security_policy_impl.cc +++ content/browser/child_process_security_policy_impl.cc -@@ -1706,6 +1706,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( +@@ -1704,6 +1704,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( // DeclarativeApiTest.PersistRules. if (actual_process_lock.matches_scheme(url::kDataScheme)) return true; diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 8d718459d..0541f7902 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 72d91d05c23a..bfa8860bcd89 100644 +index b20b829650c3..a9becc2af0ad 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/crypto.gni") @@ -10,7 +10,7 @@ index 72d91d05c23a..bfa8860bcd89 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/common/features.gni") -@@ -1964,6 +1965,7 @@ static_library("browser") { +@@ -1962,6 +1963,7 @@ static_library("browser") { "//build:chromeos_buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -18,7 +18,7 @@ index 72d91d05c23a..bfa8860bcd89 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2504,6 +2506,10 @@ static_library("browser") { +@@ -2502,6 +2504,10 @@ static_library("browser") { ] } @@ -29,7 +29,7 @@ index 72d91d05c23a..bfa8860bcd89 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -5166,7 +5172,7 @@ static_library("browser") { +@@ -5170,7 +5176,7 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 01df5773d..9efc2873b 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -13,7 +13,7 @@ index ba0c5c3fc044..b4df9af95ecd 100644 return false; } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index f225525e74eb..ee5932936215 100644 +index 2f2862c42612..b90c7363412b 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -256,6 +256,20 @@ @@ -51,7 +51,7 @@ index f225525e74eb..ee5932936215 100644 location_bar_model_ = std::make_unique( location_bar_model_delegate_.get(), content::kMaxURLDisplayChars); -@@ -1310,6 +1331,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( +@@ -1311,6 +1332,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( if (exclusive_access_manager_->HandleUserKeyEvent(event)) return content::KeyboardEventProcessingResult::HANDLED; @@ -66,7 +66,7 @@ index f225525e74eb..ee5932936215 100644 return window()->PreHandleKeyboardEvent(event); } -@@ -1317,8 +1346,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, +@@ -1318,8 +1347,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, const NativeWebKeyboardEvent& event) { DevToolsWindow* devtools_window = DevToolsWindow::GetInstanceForInspectedWebContents(source); @@ -87,7 +87,7 @@ index f225525e74eb..ee5932936215 100644 } bool Browser::TabsNeedBeforeUnloadFired() { -@@ -1538,6 +1577,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, +@@ -1539,6 +1578,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, return window->OpenURLFromTab(source, params); } @@ -102,7 +102,7 @@ index f225525e74eb..ee5932936215 100644 NavigateParams nav_params(this, params.url, params.transition); nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; -@@ -1651,6 +1698,8 @@ void Browser::LoadingStateChanged(WebContents* source, +@@ -1652,6 +1699,8 @@ void Browser::LoadingStateChanged(WebContents* source, bool to_different_document) { ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); UpdateWindowForLoadingStateChanged(source, to_different_document); @@ -111,7 +111,7 @@ index f225525e74eb..ee5932936215 100644 } void Browser::CloseContents(WebContents* source) { -@@ -1678,6 +1727,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { +@@ -1679,6 +1728,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -120,7 +120,7 @@ index f225525e74eb..ee5932936215 100644 if (!GetStatusBubble()) return; -@@ -1685,6 +1736,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { +@@ -1686,6 +1737,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { GetStatusBubble()->SetURL(url); } @@ -138,7 +138,7 @@ index f225525e74eb..ee5932936215 100644 void Browser::ContentsMouseEvent(WebContents* source, bool motion, bool exited) { -@@ -1801,6 +1863,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -1802,6 +1864,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -149,7 +149,7 @@ index f225525e74eb..ee5932936215 100644 } void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) { -@@ -1837,6 +1903,8 @@ void Browser::RendererResponsive( +@@ -1838,6 +1904,8 @@ void Browser::RendererResponsive( void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { if (web_contents == tab_strip_model_->GetActiveWebContents()) UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); @@ -158,7 +158,7 @@ index f225525e74eb..ee5932936215 100644 } content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( -@@ -1883,11 +1951,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -1884,11 +1952,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -174,7 +174,7 @@ index f225525e74eb..ee5932936215 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2730,6 +2802,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -2731,6 +2803,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { content_translate_driver->RemoveTranslationObserver(this); BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); } diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index ae9942eb6..11913cabe 100644 --- a/patch/patches/chrome_browser_net_export.patch +++ b/patch/patches/chrome_browser_net_export.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index ea17679df248..fe9280cb59ce 100644 +index c9220d6a6039..51db1a006562 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/features.gni") @@ -10,7 +10,7 @@ index ea17679df248..fe9280cb59ce 100644 import("//chrome/browser/buildflags.gni") import("//chrome/common/features.gni") import("//chromeos/assistant/assistant.gni") -@@ -332,6 +333,10 @@ static_library("ui") { +@@ -334,6 +335,10 @@ static_library("ui") { "//build/config/compiler:wexit_time_destructors", ] @@ -21,7 +21,7 @@ index ea17679df248..fe9280cb59ce 100644 # Since browser and browser_ui actually depend on each other, # we must omit the dependency from browser_ui to browser. # However, this means browser_ui and browser should more or less -@@ -355,6 +360,7 @@ static_library("ui") { +@@ -357,6 +362,7 @@ static_library("ui") { "//build:branding_buildflags", "//build:chromeos_buildflags", "//cc/paint", @@ -29,7 +29,7 @@ index ea17679df248..fe9280cb59ce 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -1581,6 +1587,7 @@ static_library("ui") { +@@ -1586,6 +1592,7 @@ static_library("ui") { "//components/page_load_metrics/browser", "//components/performance_manager:site_data_proto", "//components/printing/browser", @@ -37,7 +37,7 @@ index ea17679df248..fe9280cb59ce 100644 "//components/profile_metrics", "//components/reading_list/features:flags", "//components/safe_browsing/core/common:safe_browsing_policy_handler", -@@ -3392,7 +3399,9 @@ static_library("ui") { +@@ -3397,7 +3404,9 @@ static_library("ui") { "views/frame/browser_desktop_window_tree_host_platform.h", ] } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 0ae35ff16..555dae365 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 71730949d2bd..eedcde617f01 100644 +index 7037c1375d9c..2b1c7911e597 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -397,7 +397,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 95dd8b169..058084502 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -155,7 +155,7 @@ index 8a33ce57766c..ca69a37eee22 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 29ba5f21b38f..3ce05420eb78 100644 +index 6a94d1ec0122..211aee12cb12 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -37,6 +37,7 @@ @@ -166,7 +166,7 @@ index 29ba5f21b38f..3ce05420eb78 100644 #include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/accessibility/caption_util.h" -@@ -3591,9 +3592,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -3594,9 +3595,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // defined(OS_ANDROID) diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 7c00bd271..0a0f8e7fb 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -188,10 +188,10 @@ index 632ae86c6fd6..55b749ec1242 100644 const std::vector& all_plugins); diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index ea74ff6875fd..0c14ce034b96 100644 +index a3b189c18812..50a69d50e8e7 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -10452,6 +10452,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( +@@ -10465,6 +10465,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( } void RenderFrameHostImpl::GetPluginInfo(const GURL& url, @@ -199,7 +199,7 @@ index ea74ff6875fd..0c14ce034b96 100644 const url::Origin& main_frame_origin, const std::string& mime_type, GetPluginInfoCallback callback) { -@@ -10459,7 +10460,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, +@@ -10472,7 +10473,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, WebPluginInfo info; std::string actual_mime_type; bool found = PluginServiceImpl::GetInstance()->GetPluginInfo( @@ -210,7 +210,7 @@ index ea74ff6875fd..0c14ce034b96 100644 std::move(callback).Run(found, info, actual_mime_type); } diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h -index 6f7b14d24a4d..8b34229944a8 100644 +index ec502841c067..0279d0405d55 100644 --- content/browser/renderer_host/render_frame_host_impl.h +++ content/browser/renderer_host/render_frame_host_impl.h @@ -2234,6 +2234,7 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -234,7 +234,7 @@ index a415743ed665..5115a2407a8b 100644 string mime_type) => (bool found, diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index c8926e0e832d..d50adb22082e 100644 +index 3c75742d4ade..082827dee6de 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -9,7 +9,7 @@ @@ -247,7 +247,7 @@ index c8926e0e832d..d50adb22082e 100644 #include diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 3aed911c525b..1ac73a132e3c 100644 +index 944f98d0f979..815580ccec5a 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -32,6 +32,7 @@ @@ -258,7 +258,7 @@ index 3aed911c525b..1ac73a132e3c 100644 #include "content/public/common/page_visibility_state.h" #include "content/public/common/window_container_type.mojom-forward.h" #include "device/vr/buildflags/buildflags.h" -@@ -1731,6 +1732,14 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1735,6 +1736,14 @@ class CONTENT_EXPORT ContentBrowserClient { const base::Optional& initiating_origin, mojo::PendingRemote* out_factory); @@ -273,7 +273,7 @@ index 3aed911c525b..1ac73a132e3c 100644 // Creates an OverlayWindow to be used for Picture-in-Picture. This window // will house the content shown when in Picture-in-Picture mode. This will // return a new OverlayWindow. -@@ -1802,6 +1811,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1806,6 +1815,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); @@ -334,10 +334,10 @@ index 007e4df297a8..52017e661809 100644 // started. virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 0c9fc86e80a1..6653b5de4385 100644 +index 47e13366517c..27f359155fa9 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3564,7 +3564,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3566,7 +3566,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( WebPluginInfo info; std::string mime_type; bool found = false; diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index 797ca7e86..769941c4f 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -349,7 +349,7 @@ index 39557cce4744..236806090021 100644 } // namespace crash_reporter diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc -index 5117ded1e214..0d86e0363315 100644 +index d0c2b10f9097..851fc33b8968 100644 --- components/crash/core/app/crashpad.cc +++ components/crash/core/app/crashpad.cc @@ -152,7 +152,8 @@ void InitializeCrashpadImpl(bool initial_client, diff --git a/patch/patches/mime_handler_view_guest_1565_2727.patch b/patch/patches/mime_handler_view_guest_1565_2727.patch index 7709bf216..f646368dd 100644 --- a/patch/patches/mime_handler_view_guest_1565_2727.patch +++ b/patch/patches/mime_handler_view_guest_1565_2727.patch @@ -12,7 +12,7 @@ index 954e32c842a5..7563507d52d0 100644 virtual ~WebContentsView() {} diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc -index 8f4c53f3f3ca..ecc27f3f224c 100644 +index e910810ff0de..a45d4a4da7d6 100644 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc @@ -207,6 +207,8 @@ void MimeHandlerViewGuest::CreateWebContents( @@ -47,7 +47,7 @@ index 8f4c53f3f3ca..ecc27f3f224c 100644 WebContents* source, const content::OpenURLParams& params) { diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h -index d9e22ce31927..e02b791a19f1 100644 +index bdba06b3d493..71070693a90c 100644 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h @@ -129,6 +129,7 @@ class MimeHandlerViewGuest diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 0a0055026..374f7804f 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -58,7 +58,7 @@ index fa088bfa0019..7f00e2a2154f 100644 // Add an entry to the map. preview_dialog_map_[preview_dialog] = initiator; diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc -index 81df8a2cb0c3..ae4dcf5beb16 100644 +index bdfa513542e5..364ee827c63e 100644 --- chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc @@ -21,6 +21,7 @@ @@ -343,7 +343,7 @@ index 5beb6ac1f575..56e0fca6f317 100644 void PrintPreviewHandler::UnregisterForGaiaCookieChanges() { diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc -index 60b1fe2311c0..74ee97dbbf6d 100644 +index 0351787fc0e0..997f92ca8779 100644 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -30,6 +30,7 @@ diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index 98a870f4d..0da68dee2 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 8e71577881b0..70b4f77fe954 100644 +index 351e15aeabf3..f37a560b0bc1 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -645,10 +645,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { +@@ -648,10 +648,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { void RenderWidgetHostViewAura::UpdateBackgroundColor() { DCHECK(GetBackgroundColor()); @@ -19,7 +19,7 @@ index 8e71577881b0..70b4f77fe954 100644 } base::Optional RenderWidgetHostViewAura::GetDisplayFeature() { -@@ -2015,6 +2017,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { +@@ -2018,6 +2020,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { // This needs to happen only after |window_| has been initialized using // Init(), because it needs to have the layer. window_->SetEmbedFrameSinkId(frame_sink_id_); diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index a02f30e2b..225fabca2 100644 --- a/patch/patches/services_network_2718.patch +++ b/patch/patches/services_network_2718.patch @@ -1,5 +1,5 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index a948dde94213..4f4b09647fdb 100644 +index a3e6d130d1fe..fc06d1e69d05 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -495,10 +495,6 @@ class LoginHandlerDelegate { diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 0aa07377b..83c00825c 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 588ad8311491..7aa76b084da5 100644 +index 7564e1373371..472b2c12b0af 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -2749,6 +2749,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -39,7 +39,7 @@ index 588ad8311491..7aa76b084da5 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -7277,6 +7293,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -7286,6 +7302,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // This is an outermost WebContents. SetAsFocusedWebContentsIfNecessary(); } @@ -62,7 +62,7 @@ index f1dcf53ea481..192f7c0ddd04 100644 WebContents::CreateParams::CreateParams(const CreateParams& other) = default; diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index f1bdd0c7bad8..46a33d9094e1 100644 +index f7c4564d7ab0..ca42dfbcbd03 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -87,8 +87,10 @@ class BrowserContext; @@ -88,7 +88,7 @@ index f1bdd0c7bad8..46a33d9094e1 100644 // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h -index 9075cda6487f..c7deaa1c9752 100644 +index e752b5bd6893..f95807e06e5f 100644 --- content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h @@ -60,10 +60,12 @@ class EyeDropperListener; diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 995f90342..c9ebee57f 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,5 +1,5 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index dabe252bb0f9..17f696e06a1c 100644 +index 43f5940e58ba..70dc64c22021 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -5119,7 +5119,7 @@ Keep your key file in a safe place. You will need it to create new versions of y