mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-03-13 02:20:22 +01:00
24c2f2fa38
- CefURLRequest::Create is no longer supported in the renderer process (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead. - Mac platform definitions have been changed from `MACOSX` to `MAC` (see https://crbug.com/1105907) and related CMake macro names have been updated. The old `OS_MACOSX` define is still set in code and CMake for backwards compatibility. - Linux ARM build is currently broken (see https://crbug.com/1123214).
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 e520e957ddea..34c402af6d35 100644
|
|
--- chrome/browser/chrome_content_browser_client.cc
|
|
+++ chrome/browser/chrome_content_browser_client.cc
|
|
@@ -1022,10 +1022,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
|
|
@@ -1204,6 +1200,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
|
|
return *greased_brand_version_list;
|
|
}
|
|
|
|
+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 a47818dc2f0f..08148534aeea 100644
|
|
--- chrome/browser/chrome_content_browser_client.h
|
|
+++ chrome/browser/chrome_content_browser_client.h
|
|
@@ -91,7 +91,8 @@ class ChromeXrIntegrationClient;
|
|
}
|
|
#endif
|
|
|
|
-// Returns the user agent of Chrome.
|
|
+// Returns the product and user agent of Chrome.
|
|
+std::string GetProduct();
|
|
std::string GetUserAgent();
|
|
|
|
blink::UserAgentMetadata GetUserAgentMetadata();
|