From 4e14c8634b2aa87bf5d6dd2a7e8db62b82e0dd88 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 Mar 2015 12:55:02 +0800
Subject: [PATCH] Fix building on Windows

---
 brightray/browser/views/views_delegate.cc | 4 ++++
 brightray/browser/views/views_delegate.h  | 1 +
 brightray/vendor/libchromiumcontent       | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/brightray/browser/views/views_delegate.cc b/brightray/browser/views/views_delegate.cc
index a1078d41cb7..0d28ddcc321 100644
--- a/brightray/browser/views/views_delegate.cc
+++ b/brightray/browser/views/views_delegate.cc
@@ -54,6 +54,10 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const {
   return LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(1  /* IDR_MAINFRAME */));
 }
 
+HICON ViewsDelegate::GetSmallWindowIcon() const {
+  return GetDefaultWindowIcon();
+}
+
 bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
   return false;
 }
diff --git a/brightray/browser/views/views_delegate.h b/brightray/browser/views/views_delegate.h
index 27d64207281..bd1e7bc2b6b 100644
--- a/brightray/browser/views/views_delegate.h
+++ b/brightray/browser/views/views_delegate.h
@@ -36,6 +36,7 @@ class ViewsDelegate : public views::ViewsDelegate {
 
 #if defined(OS_WIN)
   virtual HICON GetDefaultWindowIcon() const override;
+  virtual HICON GetSmallWindowIcon() const override;
   virtual bool IsWindowInMetro(gfx::NativeWindow window) const override;
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
   virtual gfx::ImageSkia* GetDefaultWindowIcon() const override;
diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent
index 5e41ab5d654..78ddaee2158 160000
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit 5e41ab5d654a5250014f2d751a2e118c540bdff2
+Subproject commit 78ddaee2158886da53d0801db572be38230fd814