mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix brightray::GetApplicationName(), ..Version() on Linux (#11980)

Browse source 
* add brightray API to override app version

* in atom browser, use brightray app version API

* on Linux, have GetApplicationVersion() use brightray version API

* on Linux, implement brightray::GetApplicationName()

* fix typo in brightray API

* make browser.GetName() logic follow GetVersion() logic

* improve variable name in OverrideApplicationVersion declaration

* fix typo in brightray impl
This commit is contained in:
Charles Kerr 2018-02-20 10:16:51 -06:00 • committed by GitHub
parent dc62e51ba4
commit 8d086a43cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 84 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
atom/browser/browser.cc
View file

@ -97,27 +97,21 @@ void Browser::Shutdown() {
}
std::string Browser::GetVersion() const {
if (version_override_.empty()) {
std::string version = GetExecutableFileVersion();
if (!version.empty())
return version;
}
return version_override_;
std::string ret = brightray::GetOverriddenApplicationVersion();
if (ret.empty())
ret = GetExecutableFileVersion();
return ret;
}
void Browser::SetVersion(const std::string& version) {
version_override_ = version;
brightray::OverrideApplicationVersion(version);
}
std::string Browser::GetName() const {
if (name_override_.empty()) {
std::string name = GetExecutableFileProductName();
if (!name.empty())
return name;
}
return name_override_;
std::string ret = name_override_;
if (ret.empty())
ret = GetExecutableFileProductName();
return ret;
}
void Browser::SetName(const std::string& name) {