OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/tab_window_controller.h" | 5 #import "chrome/browser/cocoa/tab_window_controller.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #import "chrome/browser/cocoa/tab_strip_view.h" | 8 #import "chrome/browser/cocoa/tab_strip_view.h" |
9 | 9 |
10 @interface TabWindowController(PRIVATE) | 10 @interface TabWindowController(PRIVATE) |
(...skipping 25 matching lines...) Expand all Loading... |
36 [self performSelector:@selector(removeOverlay) | 36 [self performSelector:@selector(removeOverlay) |
37 withObject:nil | 37 withObject:nil |
38 afterDelay:delay]; | 38 afterDelay:delay]; |
39 } | 39 } |
40 | 40 |
41 - (void)showOverlay { | 41 - (void)showOverlay { |
42 [self setUseOverlay:YES]; | 42 [self setUseOverlay:YES]; |
43 } | 43 } |
44 | 44 |
45 - (NSArray*)viewsToMoveToOverlay { | 45 - (NSArray*)viewsToMoveToOverlay { |
46 return [NSArray arrayWithObject:[self tabStripView]]; | 46 return [NSArray arrayWithObjects:[self tabStripView], |
| 47 [self tabContentArea], nil]; |
47 } | 48 } |
48 | 49 |
49 // if |useOverlay| is true, we're moving views into the overlay's content | 50 // if |useOverlay| is true, we're moving views into the overlay's content |
50 // area. If false, we're moving out of the overlay back into the window's | 51 // area. If false, we're moving out of the overlay back into the window's |
51 // content. | 52 // content. |
52 - (void)moveViewsBetweenWindowAndOverlay:(BOOL)useOverlay { | 53 - (void)moveViewsBetweenWindowAndOverlay:(BOOL)useOverlay { |
53 NSView* moveTo = useOverlay ? | 54 NSView* moveTo = useOverlay ? |
54 [overlayWindow_ contentView] : [cachedContentView_ superview]; | 55 [overlayWindow_ contentView] : [cachedContentView_ superview]; |
55 NSArray* viewsToMove = [self viewsToMoveToOverlay]; | 56 NSArray* viewsToMove = [self viewsToMoveToOverlay]; |
56 for (NSView* view in viewsToMove) | 57 for (NSView* view in viewsToMove) |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 return 0; | 144 return 0; |
144 } | 145 } |
145 | 146 |
146 - (NSString*)selectedTabTitle { | 147 - (NSString*)selectedTabTitle { |
147 // subclass must implement | 148 // subclass must implement |
148 NOTIMPLEMENTED(); | 149 NOTIMPLEMENTED(); |
149 return @""; | 150 return @""; |
150 } | 151 } |
151 | 152 |
152 @end | 153 @end |
OLD | NEW |