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

fix: use correct userData path when unbundled (#30113)

Browse source
This commit is contained in:
Jeremy Rose 2021-07-14 13:10:37 -07:00 • committed by GitHub
parent 4db7221c7d
commit bec47f54f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

30
shell/common/application_info.cc
View file

@ -13,27 +13,21 @@
namespace electron {
namespace {
base::NoDestructor<std::string> g_overridden_application_name;
base::NoDestructor<std::string> g_overridden_application_version;
} // namespace
// name
void OverrideApplicationName(const std::string& name) {
*g_overridden_application_name = name;
}
std::string GetOverriddenApplicationName() {
return *g_overridden_application_name;
std::string& OverriddenApplicationName() {
static base::NoDestructor<std::string> overridden_application_name;
return *overridden_application_name;
}
// version
void OverrideApplicationVersion(const std::string& version) {
*g_overridden_application_version = version;
std::string& OverriddenApplicationVersion() {
static base::NoDestructor<std::string> overridden_application_version;
return *overridden_application_version;
}
std::string GetOverriddenApplicationVersion() {
return *g_overridden_application_version;
std::string GetPossiblyOverriddenApplicationName() {
std::string ret = OverriddenApplicationName();
if (!ret.empty())
return ret;
return GetApplicationName();
}
std::string GetApplicationUserAgent() {

7
shell/common/application_info.h
View file

@ -13,11 +13,10 @@
namespace electron {
void OverrideApplicationName(const std::string& name);
std::string GetOverriddenApplicationName();
std::string& OverriddenApplicationName();
std::string& OverriddenApplicationVersion();
void OverrideApplicationVersion(const std::string& version);
std::string GetOverriddenApplicationVersion();
std::string GetPossiblyOverriddenApplicationName();
std::string GetApplicationName();
std::string GetApplicationVersion();

4
shell/common/application_info_linux.cc
View file

@ -33,7 +33,7 @@ namespace electron {
std::string GetApplicationName() {
// attempt #1: the string set in app.setName()
std::string ret = GetOverriddenApplicationName();
std::string ret = OverriddenApplicationName();
// attempt #2: the 'Name' entry from .desktop file's [Desktop] section
if (ret.empty()) {
@ -64,7 +64,7 @@ std::string GetApplicationVersion() {
// try to use the string set in app.setVersion()
if (ret.empty())
ret = GetOverriddenApplicationVersion();
ret = OverriddenApplicationVersion();
// no known version number; return some safe fallback
if (ret.empty()) {