From b08af8947384f101ee8587bbae166d57ab439961 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 29 Jul 2015 11:22:12 +0800 Subject: [PATCH] Style fix for #2328 --- atom/browser/ui/win/notify_icon.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc index 6cf207d..450fd08 100644 --- a/atom/browser/ui/win/notify_icon.cc +++ b/atom/browser/ui/win/notify_icon.cc @@ -28,20 +28,18 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host, icon_id_(id), window_(window), 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. // Doing this prevents duplicate items from showing up in the notification // preferences (i.e. "Always Show / Show notifications only / etc") PWSTR explicit_app_id; - if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&explicit_app_id))) { // GUIDs and MD5 hashes are the same length. So convenient! base::MD5Sum(explicit_app_id, - sizeof(wchar_t) * wcslen(explicit_app_id), - (base::MD5Digest*)&tray_app_id_hash_); + sizeof(wchar_t) * wcslen(explicit_app_id), + reinterpret_cast(&tray_app_id_hash_)); has_tray_app_id_hash_ = true; - CoTaskMemFree(explicit_app_id); } @@ -184,8 +182,8 @@ void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) { if (has_tray_app_id_hash_) { icon_data->uFlags |= NIF_GUID; memcpy(reinterpret_cast(&icon_data->guidItem), - &tray_app_id_hash_, - sizeof(GUID)); + &tray_app_id_hash_, + sizeof(GUID)); } } -- 2.7.4