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

Use assignment operator since both sides are scoped now

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

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

@ -96,7 +96,7 @@ 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_.reset(IconUtil::CreateHICONFromSkBitmap(image.AsBitmap())); icon_ = 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)
@ -132,7 +132,7 @@ 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_.reset(IconUtil::CreateHICONFromSkBitmap(icon.AsBitmap())); balloon_icon_ = 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;
} }