File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change 10
10
#include " base/win/windows_version.h"
11
11
#include " third_party/skia/include/core/SkBitmap.h"
12
12
#include " ui/gfx/icon_util.h"
13
+ #include " ui/gfx/image/image.h"
13
14
#include " ui/gfx/point.h"
14
15
#include " ui/gfx/rect.h"
15
16
#include " ui/views/controls/menu/menu_runner.h"
@@ -130,7 +131,7 @@ void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
130
131
icon_data.uTimeout = 0 ;
131
132
132
133
base::win::Version win_version = base::win::GetVersion ();
133
- if (!icon.isNull () && win_version != base::win::VERSION_PRE_XP) {
134
+ if (!icon.IsEmpty () && win_version != base::win::VERSION_PRE_XP) {
134
135
balloon_icon_.Set (IconUtil::CreateHICONFromSkBitmap (icon.AsBitmap ()));
135
136
icon_data.hBalloonIcon = balloon_icon_.Get ();
136
137
icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON;
You can’t perform that action at this time.
0 commit comments