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
|
@ -140,6 +140,10 @@ void NativeWindowViews::Unmaximize() {
|
|||
window_->Restore();
|
||||
}
|
||||
|
||||
bool NativeWindowViews::IsMaximized() {
|
||||
return window_->IsMaximized();
|
||||
}
|
||||
|
||||
void NativeWindowViews::Minimize() {
|
||||
window_->Minimize();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue