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

linux: Fix building

Browse source
This commit is contained in:
Cheng Zhao 2015-01-02 19:17:02 -08:00
parent f17673be9c
commit ef7a60807b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/ui/tray_icon_gtk.cc
View file

@ -8,6 +8,7 @@
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h" #include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"
#include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h" #include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h"
#include "ui/gfx/image/image.h"
namespace atom { namespace atom {
@ -25,10 +26,10 @@ void TrayIconGtk::SetImage(const gfx::Image& image) {
base::string16 empty; base::string16 empty;
if (libgtk2ui::AppIndicatorIcon::CouldOpen()) if (libgtk2ui::AppIndicatorIcon::CouldOpen())
icon_.reset( icon_.reset(new libgtk2ui::AppIndicatorIcon(
new libgtk2ui::AppIndicatorIcon(base::GenerateGUID(), image, empty)); base::GenerateGUID(), image.AsImageSkia(), empty));
else else
icon_.reset(new libgtk2ui::Gtk2StatusIcon(image, empty)); icon_.reset(new libgtk2ui::Gtk2StatusIcon(image.AsImageSkia(), empty));
icon_->set_delegate(this); icon_->set_delegate(this);
} }