Index: ui/views/widget/native_widget_mac.mm |
diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm |
index b6aa7176a1163772804329ac8577fa0cf8146f31..e5e6de94b093142b71454b628ed8bb221d5d7e48 100644 |
--- a/ui/views/widget/native_widget_mac.mm |
+++ b/ui/views/widget/native_widget_mac.mm |
@@ -43,7 +43,7 @@ |
relativeTo:(NSInteger)otherWindowNumber { |
[[self viewsNSWindowDelegate] onWindowOrderWillChange:orderingMode]; |
[super orderWindow:orderingMode relativeTo:otherWindowNumber]; |
- [[self viewsNSWindowDelegate] onWindowOrderChanged]; |
+ [[self viewsNSWindowDelegate] onWindowOrderChanged:nil]; |
} |
@end |
@@ -340,7 +340,7 @@ void NativeWidgetMac::Show() { |
} |
void NativeWidgetMac::Hide() { |
- NOTIMPLEMENTED(); |
+ [GetNativeWindow() orderOut:nil]; |
} |
void NativeWidgetMac::ShowMaximizedWithBounds( |
@@ -428,7 +428,13 @@ void NativeWidgetMac::Maximize() { |
} |
void NativeWidgetMac::Minimize() { |
- NOTIMPLEMENTED(); |
+ NSWindow* window = GetNativeWindow(); |
+ // Calling performMiniaturize: will momentarily highlight the button, but |
+ // AppKit will reject it if there is no miniaturize button. |
+ if ([window styleMask] & NSMiniaturizableWindowMask) |
+ [window performMiniaturize:nil]; |
+ else |
+ [window miniaturize:nil]; |
} |
bool NativeWidgetMac::IsMaximized() const { |
@@ -438,12 +444,11 @@ bool NativeWidgetMac::IsMaximized() const { |
} |
bool NativeWidgetMac::IsMinimized() const { |
- NOTIMPLEMENTED(); |
- return false; |
+ return [GetNativeWindow() isMiniaturized]; |
} |
void NativeWidgetMac::Restore() { |
- NOTIMPLEMENTED(); |
+ [GetNativeWindow() deminiaturize:nil]; |
} |
void NativeWidgetMac::SetFullscreen(bool fullscreen) { |