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

win: Enable setting window icon in creation options.

Browse source
This commit is contained in:
Cheng Zhao 2013-11-11 19:23:35 +08:00
parent d5ffa4dc77
commit baa6d9730c
4 changed files with 47 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
browser/native_window.h
View file

@ -13,6 +13,7 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/web_contents_observer.h"
#include "ui/gfx/image/image.h"
#include "vendor/brightray/browser/default_web_contents_delegate.h"
namespace base {
@ -105,6 +106,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual void BlurWebView();
virtual bool IsWebViewFocused();
virtual void RestartHangMonitorTimeout();
virtual bool SetIcon(const std::string& path);
// The same with closing a tab in a real browser.
//
@ -176,6 +178,9 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
// Whether window has standard frame.
bool has_frame_;
// Window icon.
gfx::Image icon_;
private:
void RendererUnresponsiveDelayed();