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

Add BrowserWindow.setIcon

Browse source
This commit is contained in:
Cheng Zhao 2016-05-20 22:22:15 +09:00
parent b33c04d041
commit a93c9462ed
7 changed files with 59 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/native_window_views.h
View file

@ -106,12 +106,16 @@ class NativeWindowViews : public NativeWindow,
#if defined(OS_WIN)
void SetIcon(HICON small_icon, HICON app_icon);
TaskbarHost& taskbar_host() { return taskbar_host_; }
#elif defined(USE_X11)
void SetIcon(const gfx::ImageSkia& icon);
#endif
views::Widget* widget() const { return window_.get(); }
#if defined(OS_WIN)
TaskbarHost& taskbar_host() { return taskbar_host_; }
#endif
private:
// views::WidgetObserver:
void OnWidgetActivationChanged(
@ -127,10 +131,6 @@ class NativeWindowViews : public NativeWindow,
bool CanMinimize() const override;
base::string16 GetWindowTitle() const override;
bool ShouldHandleSystemCommands() const override;
#if defined(USE_X11)
gfx::ImageSkia GetWindowAppIcon() override;
gfx::ImageSkia GetWindowIcon() override;
#endif
views::Widget* GetWidget() override;
const views::Widget* GetWidget() const override;
views::View* GetContentsView() override;
@ -188,9 +188,6 @@ class NativeWindowViews : public NativeWindow,
// we need to make sure size constraints are restored when window becomes
// resizable again.
extensions::SizeConstraints old_size_constraints_;
// Window icon.
gfx::ImageSkia icon_;
#elif defined(OS_WIN)
// Weak ref.
AtomDesktopWindowTreeHostWin* atom_desktop_window_tree_host_win_;