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

Fix building on Windows

Browse source
This commit is contained in:
Cheng Zhao 2015-03-18 12:55:02 +08:00
parent 21ee1f257f
commit 4e14c8634b
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/views/views_delegate.cc
View file

@ -54,6 +54,10 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const {
return LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(1 /* IDR_MAINFRAME */)); return LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(1 /* IDR_MAINFRAME */));
} }
HICON ViewsDelegate::GetSmallWindowIcon() const {
return GetDefaultWindowIcon();
}
bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
return false; return false;
} }

1
brightray/browser/views/views_delegate.h
View file

@ -36,6 +36,7 @@ class ViewsDelegate : public views::ViewsDelegate {
#if defined(OS_WIN) #if defined(OS_WIN)
virtual HICON GetDefaultWindowIcon() const override; virtual HICON GetDefaultWindowIcon() const override;
virtual HICON GetSmallWindowIcon() const override;
virtual bool IsWindowInMetro(gfx::NativeWindow window) const override; virtual bool IsWindowInMetro(gfx::NativeWindow window) const override;
#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
virtual gfx::ImageSkia* GetDefaultWindowIcon() const override; virtual gfx::ImageSkia* GetDefaultWindowIcon() const override;

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 5e41ab5d654a5250014f2d751a2e118c540bdff2 Subproject commit 78ddaee2158886da53d0801db572be38230fd814