github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

views: Set devtools window's icon, fixes #429.

Browse Source
This commit is contained in:
Cheng Zhao
2014-09-09 15:30:33 +08:00
parent 700510d63a
commit bda317b000
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/native_window_views.cc
View File

@@ -613,6 +613,10 @@ views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
return NULL;
}
gfx::ImageSkia NativeWindowViews::GetDevToolsWindowIcon() {
return GetWindowAppIcon();
}
void NativeWindowViews::HandleMouseDown() {
// Hide menu bar when web view is clicked.
if (menu_bar_autohide_ && menu_bar_visible_) {

3
atom/browser/native_window_views.h
View File

@@ -105,6 +105,9 @@ class NativeWindowViews : public NativeWindow,
virtual views::NonClientFrameView* CreateNonClientFrameView(
views::Widget* widget) OVERRIDE;
// brightray::InspectableWebContentsDelegate:
virtual gfx::ImageSkia GetDevToolsWindowIcon() OVERRIDE;
// content::WebContentsDelegate:
virtual void HandleMouseDown() OVERRIDE;
virtual void HandleKeyboardEvent(

2
vendor/brightray vendored

Submodule vendor/brightray updated: dafc85799c...a108f0b10b