mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
047e8f9349
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
|
index f1f4f715ca7e..97075e049f9c 100644
|
|
--- chrome/browser/chrome_content_browser_client.cc
|
|
+++ chrome/browser/chrome_content_browser_client.cc
|
|
@@ -992,10 +992,6 @@ void LaunchURL(const GURL& url,
|
|
}
|
|
}
|
|
|
|
-std::string GetProduct() {
|
|
- return version_info::GetProductNameAndVersionForUserAgent();
|
|
-}
|
|
-
|
|
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
|
|
// |allowlist| combines pref/policy + cmdline switch in the browser process.
|
|
// For renderer and utility (e.g. NetworkService) processes the switch is the
|
|
@@ -1090,6 +1086,14 @@ void MaybeRecordSameSiteCookieEngagementHistogram(
|
|
|
|
} // namespace
|
|
|
|
+std::string GetProduct() {
|
|
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
|
+ if (command_line->HasSwitch(switches::kProductVersion))
|
|
+ return command_line->GetSwitchValueASCII(switches::kProductVersion);
|
|
+
|
|
+ return version_info::GetProductNameAndVersionForUserAgent();
|
|
+}
|
|
+
|
|
std::string GetUserAgent() {
|
|
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
|
if (command_line->HasSwitch(switches::kUserAgent)) {
|
|
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
|
|
index 3e2312a0bffa..940ca48b98a0 100644
|
|
--- chrome/browser/chrome_content_browser_client.h
|
|
+++ chrome/browser/chrome_content_browser_client.h
|
|
@@ -85,7 +85,8 @@ class ChromeBluetoothDelegate;
|
|
class ChromeHidDelegate;
|
|
class ChromeSerialDelegate;
|
|
|
|
-// Returns the user agent of Chrome.
|
|
+// Returns the product and user agent of Chrome.
|
|
+std::string GetProduct();
|
|
std::string GetUserAgent();
|
|
|
|
blink::UserAgentMetadata GetUserAgentMetadata();
|