github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 00:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

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 */));
}
HICON ViewsDelegate::GetSmallWindowIcon() const {
return GetDefaultWindowIcon();
}
bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
return false;
}

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

@@ -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;

2
brightray/vendor/libchromiumcontent vendored

Submodule brightray/vendor/libchromiumcontent updated: 5e41ab5d65...78ddaee215