mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 100.0.4896.0 (#972766)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
|
||||
index a001f60b279ed..b0ee6283be54f 100644
|
||||
index 958a61892a19d..e137ebe5a4146 100644
|
||||
--- components/embedder_support/user_agent_utils.cc
|
||||
+++ components/embedder_support/user_agent_utils.cc
|
||||
@@ -15,6 +15,7 @@
|
||||
@@ -7,19 +7,19 @@ index a001f60b279ed..b0ee6283be54f 100644
|
||||
#include "build/branding_buildflags.h"
|
||||
#include "build/build_config.h"
|
||||
+#include "cef/libcef/common/cef_switches.h"
|
||||
#include "components/embedder_support/pref_names.h"
|
||||
#include "components/embedder_support/switches.h"
|
||||
#include "components/policy/core/common/policy_pref_names.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
@@ -276,6 +277,12 @@ blink::UserAgentBrandList GetBrandFullVersionList(
|
||||
} // namespace
|
||||
@@ -318,6 +319,12 @@ std::string GetMajorVersionForUserAgentString(
|
||||
|
||||
std::string GetProduct(const bool allow_version_override) {
|
||||
std::string GetProduct(const bool allow_version_override,
|
||||
ForceMajorVersionToMinorPosition force_major_to_minor) {
|
||||
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
||||
+ if (command_line->HasSwitch(switches::kUserAgentProductAndVersion)) {
|
||||
+ return command_line->GetSwitchValueASCII(
|
||||
+ switches::kUserAgentProductAndVersion);
|
||||
+ }
|
||||
+
|
||||
// FF Priority 1: force major version to 99 and minor version to major version
|
||||
// number.
|
||||
// Force major version to 99 and minor version to major position.
|
||||
if (allow_version_override &&
|
||||
ShouldForceMajorVersionToMinorPosition(force_major_to_minor))
|
||||
|
Reference in New Issue
Block a user