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

Fix build and ensure no breaking change

Browse source
This commit is contained in:
Samuel Attard 2017-12-06 07:58:48 +11:00 • committed by Cheng Zhao
parent 5f7a173d1d
commit 87c2f0f14f
8 changed files with 91 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
brightray/common/application_info.cc Normal file
View file

@ -0,0 +1,18 @@
#include "brightray/common/application_info.h"
namespace brightray {
namespace {
std::string overriden_application_name_;
}
void OverrideApplicationName(const std::string& name) {
overriden_application_name_ = name;
}
std::string GetOverridenApplicationName() {
return overriden_application_name_;
}
} // namespace brightray

15
brightray/common/application_info.h
View file

@ -1,13 +1,26 @@
#ifndef BRIGHTRAY_COMMON_APPLICATION_INFO_H_
#define BRIGHTRAY_COMMON_APPLICATION_INFO_H_
#if defined(OS_WIN)
#include "brightray/browser/win/scoped_hstring.h"
#endif
#include <string>
namespace brightray {
void OverrideApplicationName(const std::string& name);
std::string GetOverridenApplicationName();
std::string GetApplicationName();
std::string GetApplicationVersion();
}
#if defined(OS_WIN)
PCWSTR GetRawAppUserModelID();
bool GetAppUserModelID(ScopedHString* app_id);
void SetAppUserModelID(const base::string16& name);
#endif
} // namespace brightray
#endif // BRIGHTRAY_COMMON_APPLICATION_INFO_H_

45
brightray/common/application_info_win.cc
View file

@ -1,12 +1,27 @@
#include "brightray/common/application_info.h"
#include <windows.h> // windows.h must be included first
#include <shlobj.h>
#include <memory>
#include "base/file_version_info.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "brightray/browser/win/scoped_hstring.h"
namespace brightray {
namespace {
base::string16 app_user_model_id_;
}
const wchar_t kAppUserModelIDFormat[] = L"electron.app.$1";
std::string GetApplicationName() {
auto module = GetModuleHandle(nullptr);
std::unique_ptr<FileVersionInfo> info(
@ -21,4 +36,34 @@ std::string GetApplicationVersion() {
return base::UTF16ToUTF8(info->product_version());
}
void SetAppUserModelID(const base::string16& name) {
app_user_model_id_ = name;
SetCurrentProcessExplicitAppUserModelID(app_user_model_id_.c_str());
}
PCWSTR GetRawAppUserModelID() {
if (app_user_model_id_.empty()) {
PWSTR current_app_id;
if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&current_app_id))) {
app_user_model_id_ = current_app_id;
} else {
std::string name = GetOverridenApplicationName();
if (name.empty()) {
name = GetApplicationName();
}
base::string16 generated_app_id = base::ReplaceStringPlaceholders(
kAppUserModelIDFormat, base::UTF8ToUTF16(name), nullptr);
SetAppUserModelID(generated_app_id);
}
CoTaskMemFree(current_app_id);
}
return app_user_model_id_.c_str();
}
bool GetAppUserModelID(ScopedHString* app_id) {
app_id->Reset(GetRawAppUserModelID());
return app_id->success();
}
} // namespace brightray