OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "ui/views/cocoa/views_nswindow_delegate.h" | 5 #import "ui/views/cocoa/views_nswindow_delegate.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #import "ui/views/cocoa/bridged_content_view.h" | 8 #import "ui/views/cocoa/bridged_content_view.h" |
9 #import "ui/views/cocoa/bridged_native_widget.h" | 9 #import "ui/views/cocoa/bridged_native_widget.h" |
10 #include "ui/views/widget/native_widget_mac.h" | 10 #include "ui/views/widget/native_widget_mac.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
109 } | 109 } |
110 | 110 |
111 - (void)windowWillExitFullScreen:(NSNotification*)notification { | 111 - (void)windowWillExitFullScreen:(NSNotification*)notification { |
112 parent_->OnFullscreenTransitionStart(false); | 112 parent_->OnFullscreenTransitionStart(false); |
113 } | 113 } |
114 | 114 |
115 - (void)windowDidExitFullScreen:(NSNotification*)notification { | 115 - (void)windowDidExitFullScreen:(NSNotification*)notification { |
116 parent_->OnFullscreenTransitionComplete(false); | 116 parent_->OnFullscreenTransitionComplete(false); |
117 } | 117 } |
118 | 118 |
119 // Allow non-resizable windows (without NSResizableWindowMask) to enter | |
120 // fullscreen by passing through the full size in willUseFullScreenContentSize. | |
121 // This only happens when -[NSWindow toggleFullscreen:] is called since | |
122 // non-resizable windows have no fullscreen button. | |
123 - (NSSize)window:(NSWindow*)window | |
124 willUseFullScreenContentSize:(NSSize)proposedSize { | |
tapted
2015/05/06 06:20:41
Can you explain this change?
And, e.g., could we
jackhou1
2015/05/13 04:27:53
Yes (and doing the same with size constraints). Bu
| |
125 return proposedSize; | |
126 } | |
127 | |
119 @end | 128 @end |
OLD | NEW |