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

Style fix for #2328

Browse source
This commit is contained in:
Cheng Zhao 2015-07-29 11:22:12 +08:00
parent b9cf0f2126
commit b08af89473
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/ui/win/notify_icon.cc
View file

@ -28,20 +28,18 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host,
icon_id_(id), icon_id_(id),
window_(window), window_(window),
message_id_(message), message_id_(message),
menu_model_(NULL) { menu_model_(NULL),
has_tray_app_id_hash_(false) {
// NB: If we have an App Model ID, we should propagate that to the tray. // NB: If we have an App Model ID, we should propagate that to the tray.
// Doing this prevents duplicate items from showing up in the notification // Doing this prevents duplicate items from showing up in the notification
// preferences (i.e. "Always Show / Show notifications only / etc") // preferences (i.e. "Always Show / Show notifications only / etc")
PWSTR explicit_app_id; PWSTR explicit_app_id;
if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&explicit_app_id))) { if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&explicit_app_id))) {
// GUIDs and MD5 hashes are the same length. So convenient! // GUIDs and MD5 hashes are the same length. So convenient!
base::MD5Sum(explicit_app_id, base::MD5Sum(explicit_app_id,
sizeof(wchar_t) * wcslen(explicit_app_id), sizeof(wchar_t) * wcslen(explicit_app_id),
(base::MD5Digest*)&tray_app_id_hash_); reinterpret_cast<base::MD5Digest*>(&tray_app_id_hash_));
has_tray_app_id_hash_ = true; has_tray_app_id_hash_ = true;
CoTaskMemFree(explicit_app_id); CoTaskMemFree(explicit_app_id);
} }
@ -184,8 +182,8 @@ void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) {
if (has_tray_app_id_hash_) { if (has_tray_app_id_hash_) {
icon_data->uFlags |= NIF_GUID; icon_data->uFlags |= NIF_GUID;
memcpy(reinterpret_cast<void*>(&icon_data->guidItem), memcpy(reinterpret_cast<void*>(&icon_data->guidItem),
&tray_app_id_hash_, &tray_app_id_hash_,
sizeof(GUID)); sizeof(GUID));
} }
} }