| 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 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1943 | 1943 |
| 1944 // Adjust to account for height and possible bookmark bar. Compress by 1 | 1944 // Adjust to account for height and possible bookmark bar. Compress by 1 |
| 1945 // to account for the separator. | 1945 // to account for the separator. |
| 1946 anchorRect.origin.y = | 1946 anchorRect.origin.y = |
| 1947 NSMaxY(anchorRect) - [toolbarController_ desiredHeightForCompression:1]; | 1947 NSMaxY(anchorRect) - [toolbarController_ desiredHeightForCompression:1]; |
| 1948 | 1948 |
| 1949 // Shift to window base coordinates. | 1949 // Shift to window base coordinates. |
| 1950 return [[toolbarView superview] convertRect:anchorRect toView:nil]; | 1950 return [[toolbarView superview] convertRect:anchorRect toView:nil]; |
| 1951 } | 1951 } |
| 1952 | 1952 |
| 1953 - (void)layoutInfoBars { |
| 1954 [self layoutSubviews]; |
| 1955 } |
| 1956 |
| 1953 - (void)sheetDidEnd:(NSWindow*)sheet | 1957 - (void)sheetDidEnd:(NSWindow*)sheet |
| 1954 returnCode:(NSInteger)code | 1958 returnCode:(NSInteger)code |
| 1955 context:(void*)context { | 1959 context:(void*)context { |
| 1956 [sheet orderOut:self]; | 1960 [sheet orderOut:self]; |
| 1957 } | 1961 } |
| 1958 | 1962 |
| 1959 - (void)onFindBarVisibilityChanged { | 1963 - (void)onFindBarVisibilityChanged { |
| 1960 [self updateAllowOverlappingViews:[self inPresentationMode]]; | 1964 [self updateAllowOverlappingViews:[self inPresentationMode]]; |
| 1961 } | 1965 } |
| 1962 | 1966 |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2236 | 2240 |
| 2237 - (BOOL)supportsBookmarkBar { | 2241 - (BOOL)supportsBookmarkBar { |
| 2238 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2242 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 2239 } | 2243 } |
| 2240 | 2244 |
| 2241 - (BOOL)isTabbedWindow { | 2245 - (BOOL)isTabbedWindow { |
| 2242 return browser_->is_type_tabbed(); | 2246 return browser_->is_type_tabbed(); |
| 2243 } | 2247 } |
| 2244 | 2248 |
| 2245 @end // @implementation BrowserWindowController(WindowType) | 2249 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |