diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc index b1d5ac049933..cfb78bb97597 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -1013,10 +1013,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 @@ -1059,6 +1055,14 @@ base::FilePath GetModulePath(base::StringPiece16 module_name) { } // 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 6bb50192ce17..6cb6a28d3114 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -85,7 +85,8 @@ enum class Channel; 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();