mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 135.0.7049.0 (#1427262)
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
|
||||
index 5d563a5311ec1..7c8c70393ed4b 100644
|
||||
index c3d8a9929e1f3..db4806237472f 100644
|
||||
--- chrome/browser/file_select_helper.cc
|
||||
+++ chrome/browser/file_select_helper.cc
|
||||
@@ -313,6 +313,12 @@ void FileSelectHelper::OnListDone(int error) {
|
||||
@@ -311,6 +311,12 @@ void FileSelectHelper::OnListDone(int error) {
|
||||
}
|
||||
|
||||
if (dialog_type_ == ui::SelectFileDialog::SELECT_UPLOAD_FOLDER) {
|
||||
@ -15,7 +15,7 @@ index 5d563a5311ec1..7c8c70393ed4b 100644
|
||||
auto model = CreateConfirmationDialog(
|
||||
entry->display_name_, std::move(chooser_files),
|
||||
base::BindOnce(&FileSelectHelper::PerformContentAnalysisIfNeeded,
|
||||
@@ -511,31 +517,51 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@@ -509,31 +515,51 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
std::vector<base::FilePath::StringType>* extensions =
|
||||
&file_type->extensions.back();
|
||||
|
||||
@ -71,7 +71,7 @@ index 5d563a5311ec1..7c8c70393ed4b 100644
|
||||
if (extensions->size() > old_extension_size)
|
||||
valid_type_count++;
|
||||
}
|
||||
@@ -552,12 +578,28 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@@ -550,12 +576,28 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
// dialog uses the first extension in the list to form the description,
|
||||
// like "EHTML Files". This is not what we want.
|
||||
if (valid_type_count > 1 ||
|
||||
@ -104,7 +104,7 @@ index 5d563a5311ec1..7c8c70393ed4b 100644
|
||||
}
|
||||
|
||||
return file_type;
|
||||
@@ -567,7 +609,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
@@ -565,7 +607,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||
void FileSelectHelper::RunFileChooser(
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
scoped_refptr<content::FileSelectListener> listener,
|
||||
@ -114,7 +114,7 @@ index 5d563a5311ec1..7c8c70393ed4b 100644
|
||||
Profile* profile = Profile::FromBrowserContext(
|
||||
render_frame_host->GetProcess()->GetBrowserContext());
|
||||
|
||||
@@ -575,6 +618,7 @@ void FileSelectHelper::RunFileChooser(
|
||||
@@ -573,6 +616,7 @@ void FileSelectHelper::RunFileChooser(
|
||||
// message.
|
||||
scoped_refptr<FileSelectHelper> file_select_helper(
|
||||
new FileSelectHelper(profile));
|
||||
@ -123,7 +123,7 @@ index 5d563a5311ec1..7c8c70393ed4b 100644
|
||||
params.Clone());
|
||||
}
|
||||
diff --git chrome/browser/file_select_helper.h chrome/browser/file_select_helper.h
|
||||
index 921b36076c3f3..d61248be1997b 100644
|
||||
index f007afe754be8..36f8ae45c5ee1 100644
|
||||
--- chrome/browser/file_select_helper.h
|
||||
+++ chrome/browser/file_select_helper.h
|
||||
@@ -64,7 +64,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
|
||||
|
Reference in New Issue
Block a user