bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-12-27 17:35:15 -05:00
parent 585cb1a434
commit 735b74619e
2 changed files with 13 additions and 12 deletions
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; scheme_info_list_locked_ = true;
} }
std::string CefContentClient::GetUserAgent() const { std::string CefContentClient::GetProduct() const {
std::string product_version; 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 = const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess(); base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserAgent)) if (command_line->HasSwitch(switches::kUserAgent))
return command_line->GetSwitchValueASCII(switches::kUserAgent); return command_line->GetSwitchValueASCII(switches::kUserAgent);
if (command_line->HasSwitch(switches::kProductVersion)) { return content::BuildUserAgentFromProduct(GetProduct());
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);
} }
base::string16 CefContentClient::GetLocalizedString(int message_id) const { 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( void AddPepperPlugins(
std::vector<content::PepperPluginInfo>* plugins) override; std::vector<content::PepperPluginInfo>* plugins) override;
void AddAdditionalSchemes(Schemes* schemes) override; void AddAdditionalSchemes(Schemes* schemes) override;
std::string GetProduct() const override;
std::string GetUserAgent() const override; std::string GetUserAgent() const override;
base::string16 GetLocalizedString(int message_id) const override; base::string16 GetLocalizedString(int message_id) const override;
base::StringPiece GetDataResource( base::StringPiece GetDataResource(