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

Coding style fixes

Browse source
This commit is contained in:
Cheng Zhao 2018-02-05 14:47:00 +09:00
parent 87c2f0f14f
commit 1c43768104
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brightray/common/application_info.cc
View file

@ -4,15 +4,15 @@ namespace brightray {
namespace {
std::string overriden_application_name_;
std::string g_overriden_application_name;
}
void OverrideApplicationName(const std::string& name) {
overriden_application_name_ = name;
g_overriden_application_name = name;
}
std::string GetOverridenApplicationName() {
return overriden_application_name_;
return g_overriden_application_name;
}
} // namespace brightray

12
brightray/common/application_info_win.cc
View file

@ -16,7 +16,7 @@ namespace brightray {
namespace {
base::string16 app_user_model_id_;
base::string16 g_app_user_model_id;
}
@ -37,15 +37,15 @@ std::string GetApplicationVersion() {
}
void SetAppUserModelID(const base::string16& name) {
app_user_model_id_ = name;
SetCurrentProcessExplicitAppUserModelID(app_user_model_id_.c_str());
g_app_user_model_id = name;
SetCurrentProcessExplicitAppUserModelID(g_app_user_model_id.c_str());
}
PCWSTR GetRawAppUserModelID() {
if (app_user_model_id_.empty()) {
if (g_app_user_model_id.empty()) {
PWSTR current_app_id;
if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&current_app_id))) {
app_user_model_id_ = current_app_id;
g_app_user_model_id = current_app_id;
} else {
std::string name = GetOverridenApplicationName();
if (name.empty()) {
@ -58,7 +58,7 @@ PCWSTR GetRawAppUserModelID() {
CoTaskMemFree(current_app_id);
}
return app_user_model_id_.c_str();
return g_app_user_model_id.c_str();
}
bool GetAppUserModelID(ScopedHString* app_id) {