| Index: chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
|
| index dd3226976f466ae4db9f6d79abd47491153b01b4..64b8d28893ee97d3209a072e8ae783b2d56be4f4 100644
|
| --- a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
|
| @@ -365,8 +365,8 @@ static BOOL PointIsInsideView(NSPoint screenPoint, NSView* view) {
|
| // to take into consideration the difference in height.
|
| NSRect targetFrame = [[targetController_ window] frame];
|
| NSRect sourceFrame = [dragWindow_ frame];
|
| - origin.y = NSMinY(targetFrame) +
|
| - (NSHeight(targetFrame) - NSHeight(sourceFrame));
|
| + origin.y = NSMinY(targetFrame) + [targetController_ menubarOffset] +
|
| + (NSHeight(targetFrame) - NSHeight(sourceFrame));
|
| }
|
| [dragWindow_ setFrameOrigin:
|
| NSMakePoint(origin.x + horizDragOffset_, origin.y)];
|
| @@ -446,7 +446,11 @@ static BOOL PointIsInsideView(NSPoint screenPoint, NSView* view) {
|
| [draggedController_ removeOverlay];
|
| } else {
|
| // Only move the window around on screen. Make sure it's set back to
|
| - // normal state (fully opaque, has shadow, has key, etc).
|
| + // normal state (fully opaque, has shadow, has key, in fullscreen if
|
| + // appropriate, etc).
|
| + [draggedController_
|
| + detachedWindowEnterFullscreenIfNeeded:sourceController_];
|
| +
|
| [draggedController_ removeOverlay];
|
| // Don't want to re-show the window if it was closed during the drag.
|
| if ([dragWindow_ isVisible]) {
|
|
|