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

Use gfx::Image instead of gfx::ImageSkia in API

Browse source 
The gfx::Image can use NSImage directly as underlying format, so we
don't have to decode images ourselves on Mac, and we will also be able
to make use of template images.
This commit is contained in:
Cheng Zhao 2015-01-02 18:43:56 -08:00
parent 3d7da455bc
commit ab83b21fa6
10 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/tray_icon.h
View file

@ -20,10 +20,10 @@ class TrayIcon {
virtual ~TrayIcon();
// Sets the image associated with this status icon.
virtual void SetImage(const gfx::ImageSkia& image) = 0;
virtual void SetImage(const gfx::Image& image) = 0;
// Sets the image associated with this status icon when pressed.
virtual void SetPressedImage(const gfx::ImageSkia& image);
virtual void SetPressedImage(const gfx::Image& image);
// Sets the hover text for this status icon. This is also used as the label
// for the menu item which is created as a replacement for the status icon
@ -41,7 +41,7 @@ class TrayIcon {
// Displays a notification balloon with the specified contents.
// Depending on the platform it might not appear by the icon tray.
virtual void DisplayBalloon(const gfx::ImageSkia& icon,
virtual void DisplayBalloon(const gfx::Image& icon,
const base::string16& title,
const base::string16& contents);