From ef7a60807bae5b7e67f7c04f123613a5690afdad Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 2 Jan 2015 19:17:02 -0800 Subject: [PATCH] linux: Fix building --- atom/browser/ui/tray_icon_gtk.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/atom/browser/ui/tray_icon_gtk.cc b/atom/browser/ui/tray_icon_gtk.cc index 3f97a40c6ddb..d95109c26e66 100644 --- a/atom/browser/ui/tray_icon_gtk.cc +++ b/atom/browser/ui/tray_icon_gtk.cc @@ -8,6 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h" #include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h" +#include "ui/gfx/image/image.h" namespace atom { @@ -25,10 +26,10 @@ void TrayIconGtk::SetImage(const gfx::Image& image) { base::string16 empty; if (libgtk2ui::AppIndicatorIcon::CouldOpen()) - icon_.reset( - new libgtk2ui::AppIndicatorIcon(base::GenerateGUID(), image, empty)); + icon_.reset(new libgtk2ui::AppIndicatorIcon( + base::GenerateGUID(), image.AsImageSkia(), empty)); else - icon_.reset(new libgtk2ui::Gtk2StatusIcon(image, empty)); + icon_.reset(new libgtk2ui::Gtk2StatusIcon(image.AsImageSkia(), empty)); icon_->set_delegate(this); }