Merge branch 'master' into chrome35
Conflicts: atom/browser/native_window_gtk.h
This commit is contained in:
commit
ee5312fff9
12 changed files with 37 additions and 1 deletions
|
@ -107,6 +107,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
|
|||
virtual bool IsVisible() = 0;
|
||||
virtual void Maximize() = 0;
|
||||
virtual void Unmaximize() = 0;
|
||||
virtual bool IsMaximized() = 0;
|
||||
virtual void Minimize() = 0;
|
||||
virtual void Restore() = 0;
|
||||
virtual void SetFullscreen(bool fullscreen) = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue