Update to Chromium version 111.0.5563.0 (#1097615)

This commit is contained in:
Marshall Greenblatt
2023-01-30 12:43:54 -05:00
parent 4c41f14360
commit dc2231cdfb
179 changed files with 986 additions and 930 deletions

View File

@ -1,5 +1,5 @@
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
index ec9d8e38dd4ba..56ed3f097843c 100644
index 24b1b799392ce..be2d605ab8907 100644
--- chrome/browser/file_select_helper.cc
+++ chrome/browser/file_select_helper.cc
@@ -20,6 +20,7 @@
@ -37,7 +37,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
#if BUILDFLAG(FULL_SAFE_BROWSING)
enterprise_connectors::ContentAnalysisDelegate::Data data;
if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
@@ -528,7 +542,8 @@ bool FileSelectHelper::IsDirectoryEnumerationStartedForTesting() {
@@ -529,7 +543,8 @@ bool FileSelectHelper::IsDirectoryEnumerationStartedForTesting() {
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
FileSelectHelper::GetFileTypesFromAcceptType(
@ -47,7 +47,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
auto base_file_type = std::make_unique<ui::SelectFileDialog::FileTypeInfo>();
if (accept_types.empty())
return base_file_type;
@@ -541,17 +556,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -542,17 +557,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
std::vector<base::FilePath::StringType>* extensions =
&file_type->extensions.back();
@ -73,7 +73,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
} else {
if (!base::IsStringASCII(accept_type))
continue;
@@ -562,10 +584,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -563,10 +585,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
description_id = IDS_AUDIO_FILES;
else if (ascii_type == "video/*")
description_id = IDS_VIDEO_FILES;
@ -94,7 +94,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
if (extensions->size() > old_extension_size)
valid_type_count++;
}
@@ -590,6 +620,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -591,6 +621,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
l10n_util::GetStringUTF16(description_id));
}
@ -110,7 +110,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
return file_type;
}
@@ -597,7 +636,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -598,7 +637,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
void FileSelectHelper::RunFileChooser(
content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
@ -120,7 +120,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
Profile* profile = Profile::FromBrowserContext(
render_frame_host->GetProcess()->GetBrowserContext());
@@ -616,6 +656,7 @@ void FileSelectHelper::RunFileChooser(
@@ -617,6 +657,7 @@ void FileSelectHelper::RunFileChooser(
// message.
scoped_refptr<FileSelectHelper> file_select_helper(
new FileSelectHelper(profile));
@ -128,7 +128,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
params.Clone());
}
@@ -669,7 +710,8 @@ void FileSelectHelper::RunFileChooser(
@@ -670,7 +711,8 @@ void FileSelectHelper::RunFileChooser(
}
void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
@ -139,7 +139,7 @@ index ec9d8e38dd4ba..56ed3f097843c 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 bacd6fd957dba..eabb9b6af35a4 100644
index d4b49202f61ce..4813ec70d9b1b 100644
--- chrome/browser/file_select_helper.h
+++ chrome/browser/file_select_helper.h
@@ -65,7 +65,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@ -152,7 +152,7 @@ index bacd6fd957dba..eabb9b6af35a4 100644
// Enumerates all the files in directory.
static void EnumerateDirectory(
@@ -293,7 +294,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -296,7 +297,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 bacd6fd957dba..eabb9b6af35a4 100644
// Check the accept type is valid. It is expected to be all lower case with
// no whitespace.
@@ -358,6 +360,9 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -361,6 +363,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;
@ -186,7 +186,7 @@ index 026f8ae631697..45b324fd3ae25 100644
raw_ptr<content::WebContents, DanglingUntriaged> source_contents_;
};
diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc
index 53b143e844879..f3c90339c8695 100644
index 101e91826023b..35456ffad43f3 100644
--- ui/shell_dialogs/execute_select_file_win.cc
+++ ui/shell_dialogs/execute_select_file_win.cc
@@ -297,9 +297,7 @@ bool ExecuteSelectSingleFile(HWND owner,
@ -238,7 +238,7 @@ index 53b143e844879..f3c90339c8695 100644
paths.push_back(std::move(path));
}
diff --git ui/shell_dialogs/select_file_dialog.cc ui/shell_dialogs/select_file_dialog.cc
index 3defd211d7f52..fce15a249bd1f 100644
index 4a67edd5e5ea0..dfbfd166fc33a 100644
--- ui/shell_dialogs/select_file_dialog.cc
+++ ui/shell_dialogs/select_file_dialog.cc
@@ -87,8 +87,10 @@ void SelectFileDialog::SetFactory(ui::SelectFileDialogFactory* factory) {
@ -323,7 +323,7 @@ index c7acd9b05fbb8..3e95e4125fa24 100644
} // namespace ui
diff --git ui/shell_dialogs/select_file_dialog_mac.mm ui/shell_dialogs/select_file_dialog_mac.mm
index 3cd217d5a0af9..5826fe4aea689 100644
index 0b8aaa3c0e4f0..fe01d3db2eabe 100644
--- ui/shell_dialogs/select_file_dialog_mac.mm
+++ ui/shell_dialogs/select_file_dialog_mac.mm
@@ -102,6 +102,10 @@ void SelectFileDialogImpl::SelectFileImpl(
@ -338,10 +338,10 @@ index 3cd217d5a0af9..5826fe4aea689 100644
std::make_unique<remote_cocoa::SelectFileDialogBridge>(ns_window),
std::move(receiver));
diff --git ui/shell_dialogs/select_file_dialog_win.cc ui/shell_dialogs/select_file_dialog_win.cc
index 5e128434d9968..1198b14aa240b 100644
index 04aa920d91675..93ea4988839cf 100644
--- ui/shell_dialogs/select_file_dialog_win.cc
+++ ui/shell_dialogs/select_file_dialog_win.cc
@@ -251,6 +251,8 @@ void SelectFileDialogImpl::SelectFileImpl(
@@ -252,6 +252,8 @@ void SelectFileDialogImpl::SelectFileImpl(
HWND owner = owning_window && owning_window->GetRootWindow()
? owning_window->GetHost()->GetAcceleratedWidget()
: nullptr;