| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 1831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1842 // Same as |x| above. | 1842 // Same as |x| above. |
| 1843 CGFloat y = 0; | 1843 CGFloat y = 0; |
| 1844 if (NSMaxY(target) < NSMaxY(source)) | 1844 if (NSMaxY(target) < NSMaxY(source)) |
| 1845 y = NSMaxY(source) - NSMaxY(target); | 1845 y = NSMaxY(source) - NSMaxY(target); |
| 1846 else if (NSMinY(source) < NSMinY(target)) | 1846 else if (NSMinY(source) < NSMinY(target)) |
| 1847 y = NSMinY(source) - NSMinY(target); | 1847 y = NSMinY(source) - NSMinY(target); |
| 1848 | 1848 |
| 1849 return NSMakeSize(x, y); | 1849 return NSMakeSize(x, y); |
| 1850 } | 1850 } |
| 1851 | 1851 |
| 1852 // (Private/TestingAPI) |
| 1853 - (FullscreenExitBubbleController*)fullscreenExitBubbleController { |
| 1854 return fullscreenExitBubbleController_.get(); |
| 1855 } |
| 1856 |
| 1852 - (void)showInstant:(TabContents*)previewContents { | 1857 - (void)showInstant:(TabContents*)previewContents { |
| 1853 [previewableContentsController_ showPreview:previewContents]; | 1858 [previewableContentsController_ showPreview:previewContents]; |
| 1854 [self updateBookmarkBarVisibilityWithAnimation:NO]; | 1859 [self updateBookmarkBarVisibilityWithAnimation:NO]; |
| 1855 } | 1860 } |
| 1856 | 1861 |
| 1857 - (void)hideInstant { | 1862 - (void)hideInstant { |
| 1858 // TODO(rohitrao): Revisit whether or not this method should be called when | 1863 // TODO(rohitrao): Revisit whether or not this method should be called when |
| 1859 // instant isn't showing. | 1864 // instant isn't showing. |
| 1860 if (![previewableContentsController_ isShowingPreview]) | 1865 if (![previewableContentsController_ isShowingPreview]) |
| 1861 return; | 1866 return; |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2168 | 2173 |
| 2169 - (BOOL)supportsBookmarkBar { | 2174 - (BOOL)supportsBookmarkBar { |
| 2170 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2175 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 2171 } | 2176 } |
| 2172 | 2177 |
| 2173 - (BOOL)isTabbedWindow { | 2178 - (BOOL)isTabbedWindow { |
| 2174 return browser_->is_type_tabbed(); | 2179 return browser_->is_type_tabbed(); |
| 2175 } | 2180 } |
| 2176 | 2181 |
| 2177 @end // @implementation BrowserWindowController(WindowType) | 2182 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |