OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #import "base/auto_reset.h" | 9 #import "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1109 // Add in the subviews above the tabContentArea. | 1109 // Add in the subviews above the tabContentArea. |
1110 for (NSUInteger i = index + 1; i < [subviews count]; ++i) { | 1110 for (NSUInteger i = index + 1; i < [subviews count]; ++i) { |
1111 NSView* view = [subviews objectAtIndex:i]; | 1111 NSView* view = [subviews objectAtIndex:i]; |
1112 [self.chromeContentView addSubview:view | 1112 [self.chromeContentView addSubview:view |
1113 positioned:NSWindowAbove | 1113 positioned:NSWindowAbove |
1114 relativeTo:nil]; | 1114 relativeTo:nil]; |
1115 } | 1115 } |
1116 } | 1116 } |
1117 | 1117 |
1118 + (BOOL)systemSettingsRequireMavericksAppKitFullscreenHack { | 1118 + (BOOL)systemSettingsRequireMavericksAppKitFullscreenHack { |
1119 if (!base::mac::IsOS10_9()) | 1119 if (base::mac::IsAtLeastOS10_10()) |
1120 return NO; | 1120 return NO; |
1121 return [NSScreen respondsToSelector:@selector(screensHaveSeparateSpaces)] && | 1121 return [NSScreen respondsToSelector:@selector(screensHaveSeparateSpaces)] && |
1122 [NSScreen screensHaveSeparateSpaces]; | 1122 [NSScreen screensHaveSeparateSpaces]; |
1123 } | 1123 } |
1124 | 1124 |
1125 - (BOOL)shouldUseMavericksAppKitFullscreenHack { | 1125 - (BOOL)shouldUseMavericksAppKitFullscreenHack { |
1126 if (![[self class] systemSettingsRequireMavericksAppKitFullscreenHack]) | 1126 if (![[self class] systemSettingsRequireMavericksAppKitFullscreenHack]) |
1127 return NO; | 1127 return NO; |
1128 if (!enteringAppKitFullscreen_) | 1128 if (!enteringAppKitFullscreen_) |
1129 return NO; | 1129 return NO; |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1268 if (fullscreenLowPowerCoordinator_) | 1268 if (fullscreenLowPowerCoordinator_) |
1269 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); | 1269 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); |
1270 } | 1270 } |
1271 | 1271 |
1272 - (void)childWindowsDidChange { | 1272 - (void)childWindowsDidChange { |
1273 if (fullscreenLowPowerCoordinator_) | 1273 if (fullscreenLowPowerCoordinator_) |
1274 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); | 1274 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); |
1275 } | 1275 } |
1276 | 1276 |
1277 @end // @implementation BrowserWindowController(Private) | 1277 @end // @implementation BrowserWindowController(Private) |
OLD | NEW |