From 1b9649b4816074168768a69f6b32163354f20234 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 6 Feb 2015 17:00:26 -0800
Subject: [PATCH] Switch to gfx::Image

---
 atom/browser/api/atom_api_window.cc | 5 +++++
 atom/browser/api/atom_api_window.h  | 3 ++-
 atom/browser/native_window.h        | 4 ++--
 atom/browser/native_window_views.cc | 5 +++--
 atom/browser/native_window_views.h  | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index cc7923feab60..3c7e7562a7c7 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
+namespace gfx {
+class Image;
+}
+
 #include "atom/browser/api/atom_api_window.h"
 
 #include "atom/browser/api/atom_api_web_contents.h"
@@ -10,6 +14,7 @@
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/native_mate_converters/image_converter.h"
 #include "content/public/browser/render_process_host.h"
 #include "native_mate/callback.h"
 #include "native_mate/constructor.h"
diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
index 70609d9894a5..b6805c83d89a 100644
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "ui/gfx/image/image.h"
 #include "atom/browser/native_window_observer.h"
 #include "atom/browser/api/event_emitter.h"
 #include "native_mate/handle.h"
@@ -118,7 +119,7 @@ class Window : public mate::EventEmitter,
   void CapturePage(mate::Arguments* args);
   void Print(mate::Arguments* args);
   void SetProgressBar(double progress);
-  void SetOverlayIcon(const gfx::ImageSkia& overlay,
+  void SetOverlayIcon(const gfx::Image& overlay,
                       const std::string& description);
   void SetAutoHideMenuBar(bool auto_hide);
   bool IsMenuBarAutoHide();
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 8048b170d2c9..c43b8d0ec2c4 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -21,7 +21,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_observer.h"
 #include "native_mate/persistent_dictionary.h"
-#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image.h"
 
 namespace base {
 class CommandLine;
@@ -142,7 +142,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
   virtual bool HasModalDialog();
   virtual gfx::NativeWindow GetNativeWindow() = 0;
   virtual void SetProgressBar(double progress) = 0;
-  virtual void SetOverlayIcon(const gfx::ImageSkia& overlay,
+  virtual void SetOverlayIcon(const gfx::Image& overlay,
                               const std::string& description) = 0;
 
   virtual bool IsClosed() const { return is_closed_; }
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index ccb760a88942..1150511ec4df 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -10,7 +10,6 @@
 
 #include <string>
 #include <vector>
-
 #include "atom/browser/ui/views/menu_bar.h"
 #include "atom/browser/ui/views/menu_layout.h"
 #include "atom/common/draggable_region.h"
@@ -22,6 +21,8 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
+#include "ui/gfx/icon_util.h"
+#include "ui/gfx/image/image.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
@@ -614,7 +615,7 @@ void NativeWindowViews::SetProgressBar(double progress) {
 }
 
 void NativeWindowViews::SetOverlayIcon(
-  const gfx::ImageSkia& overlay,
+  const gfx::Image& overlay,
   const std::string& description) {
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 5ab93f905e28..24cc9c9f436b 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -73,7 +73,7 @@ class NativeWindowViews : public NativeWindow,
   bool IsKiosk() override;
   void SetMenu(ui::MenuModel* menu_model) override;
   gfx::NativeWindow GetNativeWindow() override;
-  void SetOverlayIcon(const gfx::ImageSkia& overlay,
+  void SetOverlayIcon(const gfx::Image& overlay,
                       const std::string& description) override;
   void SetProgressBar(double value) override;
   void SetAutoHideMenuBar(bool auto_hide) override;