summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm12
-rw-r--r--chrome/browser/cocoa/tab_window_controller.mm3
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 5c35e2c..6df869f 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -562,4 +562,16 @@ willPositionSheet:(NSWindow *)sheet
return defaultSheetRect;
}
+// In addition to the tab strip and content area, which the superview's impl
+// takes care of, we need to add the toolbar and bookmark bar to the
+// overlay so they draw correctly when dragging out a new window.
+- (NSArray*)viewsToMoveToOverlay {
+ NSArray* views = [super viewsToMoveToOverlay];
+ NSArray* browserViews =
+ [NSArray arrayWithObjects:[toolbarController_ view],
+ [bookmarkController_ view],
+ nil];
+ return [views arrayByAddingObjectsFromArray:browserViews];
+}
+
@end
diff --git a/chrome/browser/cocoa/tab_window_controller.mm b/chrome/browser/cocoa/tab_window_controller.mm
index 4a82940..babe821 100644
--- a/chrome/browser/cocoa/tab_window_controller.mm
+++ b/chrome/browser/cocoa/tab_window_controller.mm
@@ -43,7 +43,8 @@
}
- (NSArray*)viewsToMoveToOverlay {
- return [NSArray arrayWithObject:[self tabStripView]];
+ return [NSArray arrayWithObjects:[self tabStripView],
+ [self tabContentArea], nil];
}
// if |useOverlay| is true, we're moving views into the overlay's content