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

refactor: replace atom_version and friends with electron_version (#18847)

Browse source
This commit is contained in:
Samuel Attard 2019-06-17 13:37:55 -07:00 • committed by GitHub
commit 4dc38d39e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 71 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/common/application_info_linux.cc
View file

@ -10,7 +10,7 @@
#include <memory>
#include <string>
#include "atom/common/atom_version.h"
#include "atom/common/electron_version.h"
#include "atom/common/platform_util.h"
#include "base/environment.h"
#include "base/logging.h"
@ -50,7 +50,7 @@ std::string GetApplicationName() {
// attempt #3: Electron's name
if (ret.empty()) {
ret = ATOM_PRODUCT_NAME;
ret = ELECTRON_PRODUCT_NAME;
}
return ret;
@ -59,9 +59,9 @@ std::string GetApplicationName() {
std::string GetApplicationVersion() {
std::string ret;
// ensure ATOM_PRODUCT_NAME and ATOM_PRODUCT_STRING match up
if (GetApplicationName() == ATOM_PRODUCT_NAME)
ret = ATOM_VERSION_STRING;
// ensure ELECTRON_PRODUCT_NAME and GetApplicationVersion match up
if (GetApplicationName() == ELECTRON_PRODUCT_NAME)
ret = ELECTRON_VERSION_STRING;
// try to use the string set in app.setVersion()
if (ret.empty())