| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/cocoa/browser_window_controller.h" | 5 #import "chrome/browser/cocoa/browser_window_controller.h" |
| 6 | 6 |
| 7 #include <Carbon/Carbon.h> | 7 #include <Carbon/Carbon.h> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/l10n_util_mac.h" | 10 #include "app/l10n_util_mac.h" |
| (...skipping 1838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1849 // Cover info bars, inspector window, and detached bookmark bar on NTP. | 1849 // Cover info bars, inspector window, and detached bookmark bar on NTP. |
| 1850 // Do not cover download shelf. | 1850 // Do not cover download shelf. |
| 1851 NSRect activeArea = [[self tabContentArea] frame]; | 1851 NSRect activeArea = [[self tabContentArea] frame]; |
| 1852 activeArea.size.height += | 1852 activeArea.size.height += |
| 1853 NSHeight([[infoBarContainerController_ view] frame]); | 1853 NSHeight([[infoBarContainerController_ view] frame]); |
| 1854 if ([self isBookmarkBarVisible] && [self placeBookmarkBarBelowInfoBar]) { | 1854 if ([self isBookmarkBarVisible] && [self placeBookmarkBarBelowInfoBar]) { |
| 1855 NSView* bookmarkBarView = [bookmarkBarController_ view]; | 1855 NSView* bookmarkBarView = [bookmarkBarController_ view]; |
| 1856 activeArea.size.height += NSHeight([bookmarkBarView frame]); | 1856 activeArea.size.height += NSHeight([bookmarkBarView frame]); |
| 1857 } | 1857 } |
| 1858 | 1858 |
| 1859 [TabposeWindow openTabposeFor:[self window] rect:activeArea slomo:slomo]; | 1859 [TabposeWindow openTabposeFor:[self window] |
| 1860 rect:activeArea |
| 1861 slomo:slomo |
| 1862 tabStripModel:browser_->tabstrip_model()]; |
| 1860 } | 1863 } |
| 1861 | 1864 |
| 1862 @end // @implementation BrowserWindowController(Fullscreen) | 1865 @end // @implementation BrowserWindowController(Fullscreen) |
| 1863 | 1866 |
| 1864 | 1867 |
| 1865 @implementation BrowserWindowController(WindowType) | 1868 @implementation BrowserWindowController(WindowType) |
| 1866 | 1869 |
| 1867 - (BOOL)supportsWindowFeature:(int)feature { | 1870 - (BOOL)supportsWindowFeature:(int)feature { |
| 1868 return browser_->SupportsWindowFeature( | 1871 return browser_->SupportsWindowFeature( |
| 1869 static_cast<Browser::WindowFeature>(feature)); | 1872 static_cast<Browser::WindowFeature>(feature)); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 1883 | 1886 |
| 1884 - (BOOL)supportsBookmarkBar { | 1887 - (BOOL)supportsBookmarkBar { |
| 1885 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 1888 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 1886 } | 1889 } |
| 1887 | 1890 |
| 1888 - (BOOL)isNormalWindow { | 1891 - (BOOL)isNormalWindow { |
| 1889 return browser_->type() == Browser::TYPE_NORMAL; | 1892 return browser_->type() == Browser::TYPE_NORMAL; |
| 1890 } | 1893 } |
| 1891 | 1894 |
| 1892 @end // @implementation BrowserWindowController(WindowType) | 1895 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |