| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <numeric> | 8 #include <numeric> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1360 - (BOOL)isDownloadShelfVisible { | 1360 - (BOOL)isDownloadShelfVisible { |
| 1361 return downloadShelfController_ != nil && | 1361 return downloadShelfController_ != nil && |
| 1362 [downloadShelfController_ isVisible]; | 1362 [downloadShelfController_ isVisible]; |
| 1363 } | 1363 } |
| 1364 | 1364 |
| 1365 - (void)createAndAddDownloadShelf { | 1365 - (void)createAndAddDownloadShelf { |
| 1366 if (!downloadShelfController_.get()) { | 1366 if (!downloadShelfController_.get()) { |
| 1367 downloadShelfController_.reset([[DownloadShelfController alloc] | 1367 downloadShelfController_.reset([[DownloadShelfController alloc] |
| 1368 initWithBrowser:browser_.get() resizeDelegate:self]); | 1368 initWithBrowser:browser_.get() resizeDelegate:self]); |
| 1369 [self.chromeContentView addSubview:[downloadShelfController_ view]]; | 1369 [self.chromeContentView addSubview:[downloadShelfController_ view]]; |
| 1370 [self layoutSubviews]; |
| 1370 } | 1371 } |
| 1371 } | 1372 } |
| 1372 | 1373 |
| 1373 - (DownloadShelfController*)downloadShelf { | 1374 - (DownloadShelfController*)downloadShelf { |
| 1374 return downloadShelfController_; | 1375 return downloadShelfController_; |
| 1375 } | 1376 } |
| 1376 | 1377 |
| 1377 - (void)addFindBar:(FindBarCocoaController*)findBarCocoaController { | 1378 - (void)addFindBar:(FindBarCocoaController*)findBarCocoaController { |
| 1378 // Shouldn't call addFindBar twice. | 1379 // Shouldn't call addFindBar twice. |
| 1379 DCHECK(!findBarCocoaController_.get()); | 1380 DCHECK(!findBarCocoaController_.get()); |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2030 | 2031 |
| 2031 - (NSRect)savedRegularWindowFrame { | 2032 - (NSRect)savedRegularWindowFrame { |
| 2032 return savedRegularWindowFrame_; | 2033 return savedRegularWindowFrame_; |
| 2033 } | 2034 } |
| 2034 | 2035 |
| 2035 - (BOOL)isFullscreenTransitionInProgress { | 2036 - (BOOL)isFullscreenTransitionInProgress { |
| 2036 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2037 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 2037 } | 2038 } |
| 2038 | 2039 |
| 2039 @end // @implementation BrowserWindowController(WindowType) | 2040 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |