| 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 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1706 // Delegate method called when window is resized. | 1706 // Delegate method called when window is resized. |
| 1707 - (void)windowDidResize:(NSNotification*)notification { | 1707 - (void)windowDidResize:(NSNotification*)notification { |
| 1708 [self saveWindowPositionIfNeeded]; | 1708 [self saveWindowPositionIfNeeded]; |
| 1709 | 1709 |
| 1710 // Resize (and possibly move) the status bubble. Note that we may get called | 1710 // Resize (and possibly move) the status bubble. Note that we may get called |
| 1711 // when the status bubble does not exist. | 1711 // when the status bubble does not exist. |
| 1712 if (statusBubble_) { | 1712 if (statusBubble_) { |
| 1713 statusBubble_->UpdateSizeAndPosition(); | 1713 statusBubble_->UpdateSizeAndPosition(); |
| 1714 } | 1714 } |
| 1715 | 1715 |
| 1716 [self updatePermissionBubbleAnchor]; |
| 1717 |
| 1716 // The FindBar needs to know its own position to properly detect overlaps | 1718 // The FindBar needs to know its own position to properly detect overlaps |
| 1717 // with find results. The position changes whenever the window is resized, | 1719 // with find results. The position changes whenever the window is resized, |
| 1718 // and |layoutSubviews| computes the FindBar's position. | 1720 // and |layoutSubviews| computes the FindBar's position. |
| 1719 // TODO: calling |layoutSubviews| here is a waste, find a better way to | 1721 // TODO: calling |layoutSubviews| here is a waste, find a better way to |
| 1720 // do this. | 1722 // do this. |
| 1721 if ([findBarCocoaController_ isFindBarVisible]) | 1723 if ([findBarCocoaController_ isFindBarVisible]) |
| 1722 [self layoutSubviews]; | 1724 [self layoutSubviews]; |
| 1723 } | 1725 } |
| 1724 | 1726 |
| 1725 // Delegate method called when window did move. (See below for why we don't use | 1727 // Delegate method called when window did move. (See below for why we don't use |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2055 | 2057 |
| 2056 - (NSRect)savedRegularWindowFrame { | 2058 - (NSRect)savedRegularWindowFrame { |
| 2057 return savedRegularWindowFrame_; | 2059 return savedRegularWindowFrame_; |
| 2058 } | 2060 } |
| 2059 | 2061 |
| 2060 - (BOOL)isFullscreenTransitionInProgress { | 2062 - (BOOL)isFullscreenTransitionInProgress { |
| 2061 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2063 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 2062 } | 2064 } |
| 2063 | 2065 |
| 2064 @end // @implementation BrowserWindowController(WindowType) | 2066 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |