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

Fix linting issues

Browse source
This commit is contained in:
Paul Betts 2015-07-24 03:30:23 -07:00
parent 75b08f510e
commit 70feb08f84
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host,
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_); (base::MD5Digest*)&tray_app_id_hash_);
CoTaskMemFree(explicit_app_id); CoTaskMemFree(explicit_app_id);
} }
@ -179,7 +179,10 @@ void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) {
icon_data->cbSize = sizeof(NOTIFYICONDATA); icon_data->cbSize = sizeof(NOTIFYICONDATA);
icon_data->hWnd = window_; icon_data->hWnd = window_;
icon_data->uID = icon_id_; icon_data->uID = icon_id_;
memcpy((void*)&icon_data->guidItem, &tray_app_id_hash_, sizeof(GUID));
memcpy(reinterpret_cast<void*>(&icon_data->guidItem),
&tray_app_id_hash_,
sizeof(GUID));
} }
} // namespace atom } // namespace atom

2
atom/browser/ui/win/notify_icon.h
View file

@ -75,7 +75,7 @@ class NotifyIcon : public TrayIcon {
// The context menu. // The context menu.
ui::SimpleMenuModel* menu_model_; ui::SimpleMenuModel* menu_model_;
// A hash of the app model ID // A hash of the app model ID
GUID tray_app_id_hash_; GUID tray_app_id_hash_;