bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return correct 'Browser' value for DevTools remote debugging (issue #2300)

This commit is contained in:
Marshall Greenblatt 2017-12-27 17:35:15 -05:00
parent e5d0cfe639
commit 7b3d7b8575
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libcef/common/content_client.cc
View File

@ -229,24 +229,24 @@ void CefContentClient::AddAdditionalSchemes(Schemes* schemes) {
scheme_info_list_locked_ = true;
}
std::string CefContentClient::GetUserAgent() const {
std::string product_version;
std::string CefContentClient::GetProduct() const {
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kProductVersion))
return command_line->GetSwitchValueASCII(switches::kProductVersion);
return base::StringPrintf("Chrome/%d.%d.%d.%d", CHROME_VERSION_MAJOR,
CHROME_VERSION_MINOR, CHROME_VERSION_BUILD,
CHROME_VERSION_PATCH);
}
std::string CefContentClient::GetUserAgent() const {
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserAgent))
return command_line->GetSwitchValueASCII(switches::kUserAgent);
if (command_line->HasSwitch(switches::kProductVersion)) {
product_version =
command_line->GetSwitchValueASCII(switches::kProductVersion);
} else {
product_version = base::StringPrintf(
"Chrome/%d.%d.%d.%d", CHROME_VERSION_MAJOR, CHROME_VERSION_MINOR,
CHROME_VERSION_BUILD, CHROME_VERSION_PATCH);
}
return content::BuildUserAgentFromProduct(product_version);
return content::BuildUserAgentFromProduct(GetProduct());
}
base::string16 CefContentClient::GetLocalizedString(int message_id) const {

1
libcef/common/content_client.h
View File

@ -34,6 +34,7 @@ class CefContentClient : public content::ContentClient,
void AddPepperPlugins(
std::vector<content::PepperPluginInfo>* plugins) override;
void AddAdditionalSchemes(Schemes* schemes) override;
std::string GetProduct() const override;
std::string GetUserAgent() const override;
base::string16 GetLocalizedString(int message_id) const override;
base::StringPiece GetDataResource(