| 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 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 962 | 962 |
| 963 [self setContentViewSubviews:subviews]; | 963 [self setContentViewSubviews:subviews]; |
| 964 } | 964 } |
| 965 | 965 |
| 966 - (void)updateSubviewZOrderFullscreen { | 966 - (void)updateSubviewZOrderFullscreen { |
| 967 base::scoped_nsobject<NSMutableArray> subviews([[NSMutableArray alloc] init]); | 967 base::scoped_nsobject<NSMutableArray> subviews([[NSMutableArray alloc] init]); |
| 968 if ([downloadShelfController_ view]) | 968 if ([downloadShelfController_ view]) |
| 969 [subviews addObject:[downloadShelfController_ view]]; | 969 [subviews addObject:[downloadShelfController_ view]]; |
| 970 if ([self tabContentArea]) | 970 if ([self tabContentArea]) |
| 971 [subviews addObject:[self tabContentArea]]; | 971 [subviews addObject:[self tabContentArea]]; |
| 972 if ([infoBarContainerController_ view]) |
| 973 [subviews addObject:[infoBarContainerController_ view]]; |
| 972 if ([self placeBookmarkBarBelowInfoBar]) { | 974 if ([self placeBookmarkBarBelowInfoBar]) { |
| 973 if ([bookmarkBarController_ view]) | 975 if ([bookmarkBarController_ view]) |
| 974 [subviews addObject:[bookmarkBarController_ view]]; | 976 [subviews addObject:[bookmarkBarController_ view]]; |
| 975 if (floatingBarBackingView_) | 977 if (floatingBarBackingView_) |
| 976 [subviews addObject:floatingBarBackingView_]; | 978 [subviews addObject:floatingBarBackingView_]; |
| 977 } else { | 979 } else { |
| 978 if (floatingBarBackingView_) | 980 if (floatingBarBackingView_) |
| 979 [subviews addObject:floatingBarBackingView_]; | 981 [subviews addObject:floatingBarBackingView_]; |
| 980 if ([bookmarkBarController_ view]) | 982 if ([bookmarkBarController_ view]) |
| 981 [subviews addObject:[bookmarkBarController_ view]]; | 983 [subviews addObject:[bookmarkBarController_ view]]; |
| 982 } | 984 } |
| 983 if ([toolbarController_ view]) | 985 if ([toolbarController_ view]) |
| 984 [subviews addObject:[toolbarController_ view]]; | 986 [subviews addObject:[toolbarController_ view]]; |
| 985 if ([infoBarContainerController_ view]) | |
| 986 [subviews addObject:[infoBarContainerController_ view]]; | |
| 987 if ([findBarCocoaController_ view]) | 987 if ([findBarCocoaController_ view]) |
| 988 [subviews addObject:[findBarCocoaController_ view]]; | 988 [subviews addObject:[findBarCocoaController_ view]]; |
| 989 | 989 |
| 990 [self setContentViewSubviews:subviews]; | 990 [self setContentViewSubviews:subviews]; |
| 991 } | 991 } |
| 992 | 992 |
| 993 - (void)setContentViewSubviews:(NSArray*)subviews { | 993 - (void)setContentViewSubviews:(NSArray*)subviews { |
| 994 // Subviews already match. | 994 // Subviews already match. |
| 995 if ([[self.chromeContentView subviews] isEqual:subviews]) | 995 if ([[self.chromeContentView subviews] isEqual:subviews]) |
| 996 return; | 996 return; |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1177 if (fullscreenLowPowerCoordinator_) | 1177 if (fullscreenLowPowerCoordinator_) |
| 1178 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); | 1178 fullscreenLowPowerCoordinator_->SetHasActiveSheet(false); |
| 1179 } | 1179 } |
| 1180 | 1180 |
| 1181 - (void)childWindowsDidChange { | 1181 - (void)childWindowsDidChange { |
| 1182 if (fullscreenLowPowerCoordinator_) | 1182 if (fullscreenLowPowerCoordinator_) |
| 1183 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); | 1183 fullscreenLowPowerCoordinator_->ChildWindowsChanged(); |
| 1184 } | 1184 } |
| 1185 | 1185 |
| 1186 @end // @implementation BrowserWindowController(Private) | 1186 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |