bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-09 00:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

alloy: Use chrome's value for ApplicationClientIdForFileScanning (fixes issue #3030)

Browse Source 
This change removes CefSettings.application_client_id_for_file_scanning in
favor of always using the same hard-coded value as chrome.
This commit is contained in:
Marshall Greenblatt 2022-03-24 12:16:08 -04:00
parent e43d2054d1
commit 77466e7b6d
5 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/cef_api_hash.h
View File

@ -42,13 +42,13 @@
// way that may cause binary incompatibility with other builds. The universal // way that may cause binary incompatibility with other builds. The universal
// hash value will change if any platform is affected whereas the platform hash // hash value will change if any platform is affected whereas the platform hash
// values will change only if that particular platform is affected. // values will change only if that particular platform is affected.
#define CEF_API_HASH_UNIVERSAL "e42afcebc271841716a6f3197194e3ea02d037cb" #define CEF_API_HASH_UNIVERSAL "b48260d601003581ec2c9e73c929334503fcde08"
#if defined(OS_WIN) #if defined(OS_WIN)
#define CEF_API_HASH_PLATFORM "e08d5cc79cedebc94efc39536c27b6c30d24c9df" #define CEF_API_HASH_PLATFORM "e65308c28b7ee4ac8f381ae05ab8a7032530c802"
#elif defined(OS_MAC) #elif defined(OS_MAC)
#define CEF_API_HASH_PLATFORM "86626c6c27b29841a4bf01c145e2d7990a73abf0" #define CEF_API_HASH_PLATFORM "969a1ae6e43f5b11a67a38a54ce2fc885a1f234d"
#elif defined(OS_LINUX) #elif defined(OS_LINUX)
#define CEF_API_HASH_PLATFORM "a19b7983d07d0e6afe0ae46c1768111078995c5e" #define CEF_API_HASH_PLATFORM "a4814c14fa26251da02fd92ebbb3db8f07646110"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

8
include/internal/cef_types.h
View File

@ -426,14 +426,6 @@ typedef struct _cef_settings_t {
/// ///
cef_string_t cookieable_schemes_list; cef_string_t cookieable_schemes_list;
int cookieable_schemes_exclude_defaults; int cookieable_schemes_exclude_defaults;
///
// GUID string used for identifying the application. This is passed to the
// system AV function for scanning downloaded files. By default, the GUID
// will be an empty string and the file will be treated as an untrusted
// file when the GUID is empty.
///
cef_string_t application_client_id_for_file_scanning;
} cef_settings_t; } cef_settings_t;
/// ///

5
include/internal/cef_types_wrappers.h
View File

@ -546,7 +546,6 @@ struct CefSettingsTraits {
cef_string_clear(&s->locales_dir_path); cef_string_clear(&s->locales_dir_path);
cef_string_clear(&s->accept_language_list); cef_string_clear(&s->accept_language_list);
cef_string_clear(&s->cookieable_schemes_list); cef_string_clear(&s->cookieable_schemes_list);
cef_string_clear(&s->application_client_id_for_file_scanning);
} }
static inline void set(const struct_type* src, static inline void set(const struct_type* src,
@ -605,10 +604,6 @@ struct CefSettingsTraits {
&target->cookieable_schemes_list, copy); &target->cookieable_schemes_list, copy);
target->cookieable_schemes_exclude_defaults = target->cookieable_schemes_exclude_defaults =
src->cookieable_schemes_exclude_defaults; src->cookieable_schemes_exclude_defaults;
cef_string_set(src->application_client_id_for_file_scanning.str,
src->application_client_id_for_file_scanning.length,
&target->application_client_id_for_file_scanning, copy);
} }
}; };

7
libcef/browser/download_manager_delegate.cc
View File

@ -405,12 +405,7 @@ void CefDownloadManagerDelegate::GetNextId(
} }
std::string CefDownloadManagerDelegate::ApplicationClientIdForFileScanning() { std::string CefDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
const CefSettings& settings = CefContext::Get()->settings(); return std::string(chrome::kApplicationClientIDStringForAVScanning);
if (settings.application_client_id_for_file_scanning.length > 0) {
return CefString(&settings.application_client_id_for_file_scanning)
.ToString();
}
return std::string();
} }
void CefDownloadManagerDelegate::OnBrowserDestroyed( void CefDownloadManagerDelegate::OnBrowserDestroyed(

4
tests/cefclient/cefclient_win.cc
View File

@ -77,10 +77,6 @@ int RunMain(HINSTANCE hInstance, int nCmdShow) {
settings.no_sandbox = true; settings.no_sandbox = true;
#endif #endif
// Applications should specify a unique GUID here to enable trusted downloads.
CefString(&settings.application_client_id_for_file_scanning)
.FromString("9A8DE24D-B822-4C6C-8259-5A848FEA1E68");
// Populate the settings based on command line arguments. // Populate the settings based on command line arguments.
context->PopulateSettings(&settings); context->PopulateSettings(&settings);