From dac76df7e392f095dcd447f0aaef9090819a8b39 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 14 Jul 2022 07:58:07 +0000 Subject: [PATCH] Update to Chromium version 104.0.5112.48 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser_dialogs_native.patch | 10 +++++----- patch/patches/chrome_browser_permission_prompt.patch | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 00dbf672f..2551b916d 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/104.0.5112.39', + 'chromium_checkout': 'refs/tags/104.0.5112.48', 'depot_tools_checkout': '350d210871' } diff --git a/patch/patches/chrome_browser_dialogs_native.patch b/patch/patches/chrome_browser_dialogs_native.patch index 1c16fe733..f1902b29d 100644 --- a/patch/patches/chrome_browser_dialogs_native.patch +++ b/patch/patches/chrome_browser_dialogs_native.patch @@ -234,10 +234,10 @@ index 653170ba60e83..677df89f93e8d 100644 // Initializes with predefined settings. void InitWithSettings(std::unique_ptr settings); diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc -index 063d4c7c96cba..24bd0533af65b 100644 +index 162dbc3aeb4ea..41b73a5a2f4e4 100644 --- ui/shell_dialogs/execute_select_file_win.cc +++ ui/shell_dialogs/execute_select_file_win.cc -@@ -289,9 +289,7 @@ bool ExecuteSelectSingleFile(HWND owner, +@@ -290,9 +290,7 @@ bool ExecuteSelectSingleFile(HWND owner, const std::vector& filter, int* filter_index, std::vector* paths) { @@ -248,7 +248,7 @@ index 063d4c7c96cba..24bd0533af65b 100644 default_path, filter, 0, filter_index, paths); } -@@ -303,14 +301,13 @@ bool ExecuteSelectMultipleFile(HWND owner, +@@ -304,14 +302,13 @@ bool ExecuteSelectMultipleFile(HWND owner, std::vector* paths) { DWORD dialog_options = FOS_ALLOWMULTISELECT; @@ -265,7 +265,7 @@ index 063d4c7c96cba..24bd0533af65b 100644 const base::FilePath& default_path, const std::vector& filter, const std::wstring& def_ext, -@@ -323,9 +320,7 @@ bool ExecuteSaveFile(HWND owner, +@@ -324,9 +321,7 @@ bool ExecuteSaveFile(HWND owner, DWORD dialog_options = FOS_OVERWRITEPROMPT; @@ -276,7 +276,7 @@ index 063d4c7c96cba..24bd0533af65b 100644 dialog_options, def_ext, filter_index, path); } -@@ -390,7 +385,7 @@ void ExecuteSelectFile( +@@ -418,7 +413,7 @@ void ExecuteSelectFile( break; case SelectFileDialog::SELECT_SAVEAS_FILE: { base::FilePath path; diff --git a/patch/patches/chrome_browser_permission_prompt.patch b/patch/patches/chrome_browser_permission_prompt.patch index 2dbfa3a06..ea7fe7da2 100644 --- a/patch/patches/chrome_browser_permission_prompt.patch +++ b/patch/patches/chrome_browser_permission_prompt.patch @@ -62,7 +62,7 @@ index c2836d15eba30..0c03c2b4666a6 100644 std::unique_ptr CreatePermissionPrompt( content::WebContents* web_contents, diff --git chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc -index 70e37336a5001..a2df1bd28c994 100644 +index acbfad1053e0b..d4e85938bfc46 100644 --- chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc +++ chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc @@ -100,11 +100,28 @@ bool ShouldBubbleStartOpen(permissions::PermissionPrompt::Delegate* delegate) {