mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 119.0.6045.0 (#1204232)
Mac: 13.5+ build system w/ 14.0 base SDK (Xcode 15.0) is now required.
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
|
||||
index 961f04a054a1a..b2080237e8deb 100644
|
||||
index 3f5042600416e..25c23b1a0f00d 100644
|
||||
--- chrome/browser/file_select_helper.cc
|
||||
+++ chrome/browser/file_select_helper.cc
|
||||
@@ -20,6 +20,7 @@
|
||||
@ -10,7 +10,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/enterprise/connectors/common.h"
|
||||
#include "chrome/browser/platform_util.h"
|
||||
@@ -253,6 +254,13 @@ void FileSelectHelper::OnListFile(
|
||||
@@ -256,6 +257,13 @@ void FileSelectHelper::OnListFile(
|
||||
void FileSelectHelper::LaunchConfirmationDialog(
|
||||
const base::FilePath& path,
|
||||
std::vector<ui::SelectedFileInfo> selected_files) {
|
||||
@ -24,7 +24,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
ShowFolderUploadConfirmationDialog(
|
||||
path,
|
||||
base::BindOnce(&FileSelectHelper::ConvertToFileChooserFileInfoList, this),
|
||||
@@ -337,6 +345,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
|
||||
@@ -340,6 +348,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
|
||||
if (AbortIfWebContentsDestroyed())
|
||||
return;
|
||||
|
||||
@ -37,7 +37,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
|
||||
enterprise_connectors::ContentAnalysisDelegate::Data data;
|
||||
if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
|
||||
@@ -467,7 +481,8 @@ void FileSelectHelper::DontAbortOnMissingWebContentsForTesting() {
|
||||
@@ -470,7 +484,8 @@ void FileSelectHelper::DontAbortOnMissingWebContentsForTesting() {
|
||||
|
||||
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
|
||||
FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@ -47,7 +47,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
auto base_file_type = std::make_unique<ui::SelectFileDialog::FileTypeInfo>();
|
||||
if (accept_types.empty())
|
||||
return base_file_type;
|
||||
@@ -480,17 +495,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@@ -483,17 +498,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
std::vector<base::FilePath::StringType>* extensions =
|
||||
&file_type->extensions.back();
|
||||
|
||||
@ -73,7 +73,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
} else {
|
||||
if (!base::IsStringASCII(accept_type))
|
||||
continue;
|
||||
@@ -501,10 +523,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@@ -504,10 +526,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
description_id = IDS_AUDIO_FILES;
|
||||
else if (ascii_type == "video/*")
|
||||
description_id = IDS_VIDEO_FILES;
|
||||
@ -94,7 +94,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
if (extensions->size() > old_extension_size)
|
||||
valid_type_count++;
|
||||
}
|
||||
@@ -529,6 +559,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@@ -532,6 +562,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
l10n_util::GetStringUTF16(description_id));
|
||||
}
|
||||
|
||||
@ -110,7 +110,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
return file_type;
|
||||
}
|
||||
|
||||
@@ -536,7 +575,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@@ -539,7 +578,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
void FileSelectHelper::RunFileChooser(
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
scoped_refptr<content::FileSelectListener> listener,
|
||||
@ -120,7 +120,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
Profile* profile = Profile::FromBrowserContext(
|
||||
render_frame_host->GetProcess()->GetBrowserContext());
|
||||
|
||||
@@ -555,6 +595,7 @@ void FileSelectHelper::RunFileChooser(
|
||||
@@ -558,6 +598,7 @@ void FileSelectHelper::RunFileChooser(
|
||||
// message.
|
||||
scoped_refptr<FileSelectHelper> file_select_helper(
|
||||
new FileSelectHelper(profile));
|
||||
@ -128,7 +128,7 @@ index 961f04a054a1a..b2080237e8deb 100644
|
||||
file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
|
||||
params.Clone());
|
||||
}
|
||||
@@ -606,7 +647,8 @@ void FileSelectHelper::RunFileChooser(
|
||||
@@ -609,7 +650,8 @@ void FileSelectHelper::RunFileChooser(
|
||||
}
|
||||
|
||||
void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
|
||||
@ -139,7 +139,7 @@ index 961f04a054a1a..b2080237e8deb 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 143b971ea541e..a45df89a843b0 100644
|
||||
index 57dae0b3670ae..85eeda4cbaa5b 100644
|
||||
--- chrome/browser/file_select_helper.h
|
||||
+++ chrome/browser/file_select_helper.h
|
||||
@@ -62,7 +62,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
|
||||
@ -255,10 +255,10 @@ 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 f4c63672b1a5f..6c756beaba0f3 100644
|
||||
index 65f0342389117..c4b79bc0dab91 100644
|
||||
--- ui/shell_dialogs/select_file_dialog.h
|
||||
+++ ui/shell_dialogs/select_file_dialog.h
|
||||
@@ -114,7 +114,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -116,7 +116,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
// is refcounted and uses a background thread.
|
||||
static scoped_refptr<SelectFileDialog> Create(
|
||||
Listener* listener,
|
||||
@ -268,7 +268,7 @@ index f4c63672b1a5f..6c756beaba0f3 100644
|
||||
|
||||
SelectFileDialog(const SelectFileDialog&) = delete;
|
||||
SelectFileDialog& operator=(const SelectFileDialog&) = delete;
|
||||
@@ -211,6 +212,19 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -213,6 +214,19 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
const GURL* caller = nullptr);
|
||||
bool HasMultipleFileTypeChoices();
|
||||
|
||||
@ -288,7 +288,7 @@ index f4c63672b1a5f..6c756beaba0f3 100644
|
||||
protected:
|
||||
friend class base::RefCountedThreadSafe<SelectFileDialog>;
|
||||
|
||||
@@ -236,6 +250,11 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -238,6 +252,11 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
// The listener to be notified of selection completion.
|
||||
raw_ptr<Listener> listener_;
|
||||
|
||||
@ -300,7 +300,7 @@ index f4c63672b1a5f..6c756beaba0f3 100644
|
||||
private:
|
||||
// Tests if the file selection dialog can be displayed by
|
||||
// testing if the AllowFileSelectionDialogs-Policy is
|
||||
@@ -248,8 +267,6 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -250,8 +269,6 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
|
||||
// Returns true if the dialog has multiple file type choices.
|
||||
virtual bool HasMultipleFileTypeChoicesImpl() = 0;
|
||||
|
Reference in New Issue
Block a user