OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/mac/foundation_util.h" | 8 #include "base/mac/foundation_util.h" |
9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
10 #include "base/mac/sdk_forward_declarations.h" | 10 #include "base/mac/sdk_forward_declarations.h" |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 return NO; // See top of file NOTE: Maximize and Zoom. | 156 return NO; // See top of file NOTE: Maximize and Zoom. |
157 } | 157 } |
158 | 158 |
159 // Allow non resizable windows (without NSResizableWindowMask) to enter | 159 // Allow non resizable windows (without NSResizableWindowMask) to enter |
160 // fullscreen by passing through the full size in willUseFullScreenContentSize. | 160 // fullscreen by passing through the full size in willUseFullScreenContentSize. |
161 - (NSSize)window:(NSWindow *)window | 161 - (NSSize)window:(NSWindow *)window |
162 willUseFullScreenContentSize:(NSSize)proposedSize { | 162 willUseFullScreenContentSize:(NSSize)proposedSize { |
163 return proposedSize; | 163 return proposedSize; |
164 } | 164 } |
165 | 165 |
166 - (void)executeCommand:(int)command { | |
167 // No-op, swallow the event. | |
168 } | |
169 | |
170 - (BOOL)handledByExtensionCommand:(NSEvent*)event | 166 - (BOOL)handledByExtensionCommand:(NSEvent*)event |
171 priority:(ui::AcceleratorManager::HandlerPriority)priority { | 167 priority:(ui::AcceleratorManager::HandlerPriority)priority { |
172 if (appWindow_) | 168 if (appWindow_) |
173 return appWindow_->HandledByExtensionCommand(event, priority); | 169 return appWindow_->HandledByExtensionCommand(event, priority); |
174 return NO; | 170 return NO; |
175 } | 171 } |
176 | 172 |
177 @end | 173 @end |
178 | 174 |
179 @interface AppNSWindow : ChromeEventProcessingWindow | 175 @interface AppNSWindow : ChromeEventProcessingWindow |
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
880 } | 876 } |
881 | 877 |
882 void NativeAppWindowCocoa::UpdateRestoredBounds() { | 878 void NativeAppWindowCocoa::UpdateRestoredBounds() { |
883 if (IsRestored(*this)) | 879 if (IsRestored(*this)) |
884 restored_bounds_ = [window() frame]; | 880 restored_bounds_ = [window() frame]; |
885 } | 881 } |
886 | 882 |
887 void NativeAppWindowCocoa::HideWithoutMarkingHidden() { | 883 void NativeAppWindowCocoa::HideWithoutMarkingHidden() { |
888 [window() orderOut:window_controller_]; | 884 [window() orderOut:window_controller_]; |
889 } | 885 } |
OLD | NEW |