Prepare chrome/ for compilation with OS X 10.7 deployment target.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac/scoped_cftyperef.h"
 #import "base/mac/sdk_forward_declarations.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #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;
 const NSTimeInterval kTearDuration = 0.333;
 
 // Returns whether |screenPoint| is inside the bounds of |view|.
 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]];
 }
 
 @interface TabStripDragController (Private)
 - (NSArray*)selectedTabViews;
 - (BOOL)canDragSelectedTabs;
 - (void)resetDragControllers;
 - (NSArray*)dropTargetsForController:(TabWindowController*)dragController;
 - (void)setWindowBackgroundVisibility:(BOOL)shouldBeVisible;
@@ skipping 339 matching lines @@
     if (![[targetController_ window] isKeyWindow])
       [[targetController_ window] orderFront:nil];
 
     // Compute where placeholder should go and insert it into the
     // destination tab strip.
     // The placeholder frame is the rect that contains all dragged tabs.
     NSRect tabFrame = NSZeroRect;
     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]
                                          frame:tabFrame];
     [targetController_ layoutTabs];
   } else {
     [dragWindow_ makeKeyAndOrderFront:nil];
   }
 
   // Adjust the visibility of the window background. If there is a drop target,
@@ skipping 155 matching lines @@
     [[targetController_ window] makeMainWindow];
   } else {
     [dragWindow_ setAlphaValue:0.5];
     [[draggedController_ overlayWindow] setHasShadow:NO];
     [[draggedController_ window] makeMainWindow];
   }
   chromeIsVisible_ = shouldBeVisible;
 }
 
 @end