chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm - Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm

Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Compile errors. Fix null-window error. Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 eb8de39f03b4c6d650094bd028f2bc5da760adeb..dd3226976f466ae4db9f6d79abd47491153b01b4 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm

@@ -14,6 +14,7 @@

#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"

#import "chrome/browser/ui/cocoa/tabs/tab_view.h"

#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"

+#include "ui/base/cocoa/cocoa_base_utils.h"

#include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"

const CGFloat kTearDistance = 36.0;

@@ -23,7 +24,8 @@ const NSTimeInterval kTearDuration = 0.333;

static BOOL PointIsInsideView(NSPoint screenPoint, NSView* view) {

if ([view window] == nil)

return NO;

- NSPoint windowPoint = [[view window] convertScreenToBase:screenPoint];

+ NSPoint windowPoint =

+ ui::ConvertPointFromScreenToWindow([view window], screenPoint);

NSPoint viewPoint = [view convertPoint:windowPoint fromView:nil];

return [view mouse:viewPoint inRect:[view bounds]];

}

@@ -383,9 +385,8 @@ static BOOL PointIsInsideView(NSPoint screenPoint, NSView* view) {

for (NSView* tabView in [draggedController_ tabViews]) {

tabFrame = NSUnionRect(tabFrame, [tabView frame]);

}

- tabFrame.origin = [dragWindow_ convertBaseToScreen:tabFrame.origin];

- tabFrame.origin = [[targetController_ window]

- convertScreenToBase:tabFrame.origin];

+ tabFrame = [dragWindow_ convertRectToScreen:tabFrame];

+ tabFrame = [[targetController_ window] convertRectFromScreen:tabFrame];

tabFrame = [[targetController_ tabStripView]

convertRect:tabFrame fromView:nil];

[targetController_ insertPlaceholderForTab:[draggedTab_ tabView]