bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 117.0.5895.0 (#1171312)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-07-20 18:11:34 -04:00
parent 1353677a98
commit 8b46735b79
78 changed files with 489 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patch/patches/chrome_browser_dialogs_native.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
index 1ee6c28cd47bc..62fd628dffd07 100644
index 3d1c3d62953cf..b352990508904 100644
--- chrome/browser/file_select_helper.cc
+++ chrome/browser/file_select_helper.cc
@@ -20,6 +20,7 @@
@ -10,7 +10,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/common.h"
#include "chrome/browser/platform_util.h"
@@ -250,6 +251,13 @@ void FileSelectHelper::OnListFile(
@@ -251,6 +252,13 @@ void FileSelectHelper::OnListFile(
void FileSelectHelper::LaunchConfirmationDialog(
const base::FilePath& path,
std::vector<ui::SelectedFileInfo> selected_files) {
@ -24,7 +24,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
ShowFolderUploadConfirmationDialog(
path,
base::BindOnce(&FileSelectHelper::ConvertToFileChooserFileInfoList, this),
@@ -334,6 +342,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
@@ -335,6 +343,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
if (AbortIfWebContentsDestroyed())
return;
@ -34,10 +34,10 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
+ return;
+ }
+
#if BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
enterprise_connectors::ContentAnalysisDelegate::Data data;
if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
@@ -522,7 +536,8 @@ bool FileSelectHelper::IsDirectoryEnumerationStartedForTesting() {
@@ -463,7 +477,8 @@ void FileSelectHelper::DontAbortOnMissingWebContentsForTesting() {
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
FileSelectHelper::GetFileTypesFromAcceptType(
@ -47,7 +47,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
auto base_file_type = std::make_unique<ui::SelectFileDialog::FileTypeInfo>();
if (accept_types.empty())
return base_file_type;
@@ -535,17 +550,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -476,17 +491,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
std::vector<base::FilePath::StringType>* extensions =
&file_type->extensions.back();
@ -73,7 +73,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
} else {
if (!base::IsStringASCII(accept_type))
continue;
@@ -556,10 +578,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -497,10 +519,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
description_id = IDS_AUDIO_FILES;
else if (ascii_type == "video/*")
description_id = IDS_VIDEO_FILES;
@ -94,7 +94,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
if (extensions->size() > old_extension_size)
valid_type_count++;
}
@@ -584,6 +614,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -525,6 +555,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
l10n_util::GetStringUTF16(description_id));
}
@ -110,7 +110,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
return file_type;
}
@@ -591,7 +630,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -532,7 +571,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
void FileSelectHelper::RunFileChooser(
content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
@ -120,7 +120,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
Profile* profile = Profile::FromBrowserContext(
render_frame_host->GetProcess()->GetBrowserContext());
@@ -610,6 +650,7 @@ void FileSelectHelper::RunFileChooser(
@@ -551,6 +591,7 @@ void FileSelectHelper::RunFileChooser(
// message.
scoped_refptr<FileSelectHelper> file_select_helper(
new FileSelectHelper(profile));
@ -128,7 +128,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
params.Clone());
}
@@ -661,7 +702,8 @@ void FileSelectHelper::RunFileChooser(
@@ -602,7 +643,8 @@ void FileSelectHelper::RunFileChooser(
}
void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
@ -139,10 +139,10 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
params->need_local_path ? ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH
: ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
diff --git chrome/browser/file_select_helper.h chrome/browser/file_select_helper.h
index e3a85080fd37d..2f3e8e64614d7 100644
index 143b971ea541e..a45df89a843b0 100644
--- chrome/browser/file_select_helper.h
+++ chrome/browser/file_select_helper.h
@@ -61,7 +61,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -62,7 +62,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
static void RunFileChooser(
content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
@ -152,7 +152,7 @@ index e3a85080fd37d..2f3e8e64614d7 100644
// Enumerates all the files in directory.
static void EnumerateDirectory(
@@ -288,7 +289,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -268,7 +269,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
// |accept_types| contains only valid lowercased MIME types or file extensions
// beginning with a period (.).
static std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
@ -162,7 +162,7 @@ index e3a85080fd37d..2f3e8e64614d7 100644
// Check the accept type is valid. It is expected to be all lower case with
// no whitespace.
@@ -349,6 +351,9 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -329,6 +331,9 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
// Set to false in unit tests since there is no WebContents.
bool abort_on_missing_web_contents_in_tests_ = true;
@ -173,7 +173,7 @@ index e3a85080fd37d..2f3e8e64614d7 100644
base::WeakPtrFactory<FileSelectHelper> weak_ptr_factory_{this};
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git chrome/browser/ui/chrome_select_file_policy.h chrome/browser/ui/chrome_select_file_policy.h
index 026f8ae631697..45b324fd3ae25 100644
index 6e85ac927afc4..41cf347a7a2e1 100644
--- chrome/browser/ui/chrome_select_file_policy.h
+++ chrome/browser/ui/chrome_select_file_policy.h
@@ -30,6 +30,8 @@ class ChromeSelectFilePolicy : public ui::SelectFilePolicy {
@ -183,7 +183,7 @@ index 026f8ae631697..45b324fd3ae25 100644
+ content::WebContents* source_contents() const { return source_contents_; }
+
private:
raw_ptr<content::WebContents, DanglingUntriaged> source_contents_;
raw_ptr<content::WebContents, DanglingAcrossTasks> source_contents_;
};
diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc
index 101e91826023b..35456ffad43f3 100644
@ -255,7 +255,7 @@ index e2c00b2ec1532..a2e8753766597 100644
return CreateSelectFileDialog(listener, std::move(policy));
}
diff --git ui/shell_dialogs/select_file_dialog.h ui/shell_dialogs/select_file_dialog.h
index 3f1db1a9c6fd3..1f0e4af378c78 100644
index b27b152cf8843..765abdf241fca 100644
--- ui/shell_dialogs/select_file_dialog.h
+++ ui/shell_dialogs/select_file_dialog.h
@@ -114,7 +114,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
@ -290,7 +290,7 @@ index 3f1db1a9c6fd3..1f0e4af378c78 100644
@@ -236,6 +250,11 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
// The listener to be notified of selection completion.
raw_ptr<Listener, DanglingUntriaged> listener_;
raw_ptr<Listener, DanglingAcrossTasks> listener_;
+ std::unique_ptr<SelectFilePolicy> select_file_policy_;
+