mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-17 20:50:42 +01:00
Update to Chromium version 110.0.5481.52
This commit is contained in:
parent
a9eaf00d40
commit
a3a017c8d8
@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/110.0.5481.38',
|
'chromium_checkout': 'refs/tags/110.0.5481.52',
|
||||||
'depot_tools_checkout': '252b19866a'
|
'depot_tools_checkout': '252b19866a'
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
|
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
|
||||||
index ec9d8e38dd4ba..56ed3f097843c 100644
|
index d61d8e29d9015..00a923e6fda8a 100644
|
||||||
--- chrome/browser/file_select_helper.cc
|
--- chrome/browser/file_select_helper.cc
|
||||||
+++ chrome/browser/file_select_helper.cc
|
+++ chrome/browser/file_select_helper.cc
|
||||||
@@ -20,6 +20,7 @@
|
@@ -20,6 +20,7 @@
|
||||||
@ -37,7 +37,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
#if BUILDFLAG(FULL_SAFE_BROWSING)
|
#if BUILDFLAG(FULL_SAFE_BROWSING)
|
||||||
enterprise_connectors::ContentAnalysisDelegate::Data data;
|
enterprise_connectors::ContentAnalysisDelegate::Data data;
|
||||||
if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
|
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>
|
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
|
||||||
FileSelectHelper::GetFileTypesFromAcceptType(
|
FileSelectHelper::GetFileTypesFromAcceptType(
|
||||||
@ -47,7 +47,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
auto base_file_type = std::make_unique<ui::SelectFileDialog::FileTypeInfo>();
|
auto base_file_type = std::make_unique<ui::SelectFileDialog::FileTypeInfo>();
|
||||||
if (accept_types.empty())
|
if (accept_types.empty())
|
||||||
return base_file_type;
|
return base_file_type;
|
||||||
@@ -541,17 +556,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
@@ -542,17 +557,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||||
std::vector<base::FilePath::StringType>* extensions =
|
std::vector<base::FilePath::StringType>* extensions =
|
||||||
&file_type->extensions.back();
|
&file_type->extensions.back();
|
||||||
|
|
||||||
@ -73,7 +73,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
} else {
|
} else {
|
||||||
if (!base::IsStringASCII(accept_type))
|
if (!base::IsStringASCII(accept_type))
|
||||||
continue;
|
continue;
|
||||||
@@ -562,10 +584,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
@@ -563,10 +585,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||||
description_id = IDS_AUDIO_FILES;
|
description_id = IDS_AUDIO_FILES;
|
||||||
else if (ascii_type == "video/*")
|
else if (ascii_type == "video/*")
|
||||||
description_id = IDS_VIDEO_FILES;
|
description_id = IDS_VIDEO_FILES;
|
||||||
@ -94,7 +94,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
if (extensions->size() > old_extension_size)
|
if (extensions->size() > old_extension_size)
|
||||||
valid_type_count++;
|
valid_type_count++;
|
||||||
}
|
}
|
||||||
@@ -590,6 +620,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
@@ -591,6 +621,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||||
l10n_util::GetStringUTF16(description_id));
|
l10n_util::GetStringUTF16(description_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
return file_type;
|
return file_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -597,7 +636,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
@@ -598,7 +637,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
|
||||||
void FileSelectHelper::RunFileChooser(
|
void FileSelectHelper::RunFileChooser(
|
||||||
content::RenderFrameHost* render_frame_host,
|
content::RenderFrameHost* render_frame_host,
|
||||||
scoped_refptr<content::FileSelectListener> listener,
|
scoped_refptr<content::FileSelectListener> listener,
|
||||||
@ -120,7 +120,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
Profile* profile = Profile::FromBrowserContext(
|
Profile* profile = Profile::FromBrowserContext(
|
||||||
render_frame_host->GetProcess()->GetBrowserContext());
|
render_frame_host->GetProcess()->GetBrowserContext());
|
||||||
|
|
||||||
@@ -616,6 +656,7 @@ void FileSelectHelper::RunFileChooser(
|
@@ -617,6 +657,7 @@ void FileSelectHelper::RunFileChooser(
|
||||||
// message.
|
// message.
|
||||||
scoped_refptr<FileSelectHelper> file_select_helper(
|
scoped_refptr<FileSelectHelper> file_select_helper(
|
||||||
new FileSelectHelper(profile));
|
new FileSelectHelper(profile));
|
||||||
@ -128,7 +128,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
|
file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
|
||||||
params.Clone());
|
params.Clone());
|
||||||
}
|
}
|
||||||
@@ -669,7 +710,8 @@ void FileSelectHelper::RunFileChooser(
|
@@ -670,7 +711,8 @@ void FileSelectHelper::RunFileChooser(
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
|
void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
|
||||||
@ -139,7 +139,7 @@ index ec9d8e38dd4ba..56ed3f097843c 100644
|
|||||||
params->need_local_path ? ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH
|
params->need_local_path ? ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH
|
||||||
: ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
|
: ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
|
||||||
diff --git chrome/browser/file_select_helper.h chrome/browser/file_select_helper.h
|
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
|
||||||
+++ chrome/browser/file_select_helper.h
|
+++ chrome/browser/file_select_helper.h
|
||||||
@@ -65,7 +65,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
|
@@ -65,7 +65,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
|
||||||
@ -152,7 +152,7 @@ index bacd6fd957dba..eabb9b6af35a4 100644
|
|||||||
|
|
||||||
// Enumerates all the files in directory.
|
// Enumerates all the files in directory.
|
||||||
static void EnumerateDirectory(
|
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
|
// |accept_types| contains only valid lowercased MIME types or file extensions
|
||||||
// beginning with a period (.).
|
// beginning with a period (.).
|
||||||
static std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
|
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
|
// Check the accept type is valid. It is expected to be all lower case with
|
||||||
// no whitespace.
|
// 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.
|
// Set to false in unit tests since there is no WebContents.
|
||||||
bool abort_on_missing_web_contents_in_tests_ = true;
|
bool abort_on_missing_web_contents_in_tests_ = true;
|
||||||
|
|
||||||
|
@ -153,7 +153,7 @@ index f6df78d4d3878..5e4984760ba56 100644
|
|||||||
// reset to null.
|
// reset to null.
|
||||||
const CookieAccessDelegate* cookie_access_delegate() const {
|
const CookieAccessDelegate* cookie_access_delegate() const {
|
||||||
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
|
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
|
||||||
index 9da2056ddd3cf..c097bb2e8aba3 100644
|
index 120f304fc27db..7e665fc95a516 100644
|
||||||
--- services/network/cookie_manager.cc
|
--- services/network/cookie_manager.cc
|
||||||
+++ services/network/cookie_manager.cc
|
+++ services/network/cookie_manager.cc
|
||||||
@@ -283,14 +283,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
@@ -283,14 +283,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user