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

Update Get() => get(), Set() => reset()

Browse source
This commit is contained in:
Paul Betts 2016-03-09 11:05:17 -08:00 • committed by Cheng Zhao
parent a737baafbf
commit 60a2495b30
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,7 @@ void NotifyIcon::ResetIcon() {
InitIconData(&icon_data); InitIconData(&icon_data);
icon_data.uFlags |= NIF_MESSAGE; icon_data.uFlags |= NIF_MESSAGE;
icon_data.uCallbackMessage = message_id_; icon_data.uCallbackMessage = message_id_;
icon_data.hIcon = icon_.Get(); icon_data.hIcon = icon_.get();
// If we have an image, then set the NIF_ICON flag, which tells // If we have an image, then set the NIF_ICON flag, which tells
// Shell_NotifyIcon() to set the image for the status icon it creates. // Shell_NotifyIcon() to set the image for the status icon it creates.
if (icon_data.hIcon) if (icon_data.hIcon)
@ -96,8 +96,8 @@ void NotifyIcon::SetImage(const gfx::Image& image) {
NOTIFYICONDATA icon_data; NOTIFYICONDATA icon_data;
InitIconData(&icon_data); InitIconData(&icon_data);
icon_data.uFlags |= NIF_ICON; icon_data.uFlags |= NIF_ICON;
icon_.Set(IconUtil::CreateHICONFromSkBitmap(image.AsBitmap())); icon_.reset(IconUtil::CreateHICONFromSkBitmap(image.AsBitmap()));
icon_data.hIcon = icon_.Get(); icon_data.hIcon = icon_.get();
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data); BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
if (!result) if (!result)
LOG(WARNING) << "Error setting status tray icon image"; LOG(WARNING) << "Error setting status tray icon image";
@ -132,8 +132,8 @@ void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
base::win::Version win_version = base::win::GetVersion(); base::win::Version win_version = base::win::GetVersion();
if (!icon.IsEmpty() && win_version != base::win::VERSION_PRE_XP) { if (!icon.IsEmpty() && win_version != base::win::VERSION_PRE_XP) {
balloon_icon_.Set(IconUtil::CreateHICONFromSkBitmap(icon.AsBitmap())); balloon_icon_.reset(IconUtil::CreateHICONFromSkBitmap(icon.AsBitmap()));
icon_data.hBalloonIcon = balloon_icon_.Get(); icon_data.hBalloonIcon = balloon_icon_.get();
icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON; icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON;
} }