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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index f0b85f50eee335110bfc383ddb0cfa5868f9585a..704dcbea8e81b7c06f48b77834ff934b1ca81f64 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include "base/mac/bundle_locations.h"
+#include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/bookmarks/bookmark_model_factory.h"
 #import "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
@@ -23,6 +24,7 @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #import "components/bookmarks/managed/managed_bookmark_service.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/theme_provider.h"
 
 using bookmarks::BookmarkModel;
@@ -496,14 +498,12 @@ NSRect GetFirstButtonFrameForHeight(CGFloat height) {
     // popping up from the bookmark bar itself.  In this case, start
     // BELOW the parent button.  Our left is the button left; our top
     // is bottom of button's parent view.
-    NSPoint buttonBottomLeftInScreen =
-        [[parentButton_ window]
-            convertBaseToScreen:[parentButton_
-                                    convertPoint:NSZeroPoint toView:nil]];
-    NSPoint bookmarkBarBottomLeftInScreen =
-        [[parentButton_ window]
-            convertBaseToScreen:[[parentButton_ superview]
-                                    convertPoint:NSZeroPoint toView:nil]];
+    NSPoint buttonBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
+        [parentButton_ window],
+        [parentButton_ convertPoint:NSZeroPoint toView:nil]);
+    NSPoint bookmarkBarBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
+        [parentButton_ window],
+        [[parentButton_ superview] convertPoint:NSZeroPoint toView:nil]);
     newWindowTopLeft = NSMakePoint(
         buttonBottomLeftInScreen.x + bookmarks::kBookmarkBarButtonOffset,
         bookmarkBarBottomLeftInScreen.y + bookmarks::kBookmarkBarMenuOffset);
@@ -538,9 +538,9 @@ NSRect GetFirstButtonFrameForHeight(CGFloat height) {
     NSPoint topOfWindow = NSMakePoint(0,
                                       NSMaxY([parentButton_ frame]) -
                                           bookmarks::kBookmarkVerticalPadding);
-    topOfWindow = [[parentButton_ window]
-                   convertBaseToScreen:[[parentButton_ superview]
-                                        convertPoint:topOfWindow toView:nil]];
+    topOfWindow = ui::ConvertPointFromWindowToScreen(
+        [parentButton_ window],
+        [[parentButton_ superview] convertPoint:topOfWindow toView:nil]);
     newWindowTopLeft.y = topOfWindow.y +
                          2 * bookmarks::kBookmarkVerticalPadding;
   }
@@ -1040,8 +1040,8 @@ NSRect GetFirstButtonFrameForHeight(CGFloat height) {
   NSButton* button = parentButton_.get();
   NSRect parentButtonGlobalFrame =
       [button convertRect:[button bounds] toView:nil];
-  parentButtonGlobalFrame.origin =
-      [[button window] convertBaseToScreen:parentButtonGlobalFrame.origin];
+  parentButtonGlobalFrame =
+      [[button window] convertRectToScreen:parentButtonGlobalFrame];
   for (NSScreen* screen in [NSScreen screens]) {
     if (NSIntersectsRect([screen frame], parentButtonGlobalFrame))
       return screen;
@@ -1064,19 +1064,19 @@ NSRect GetFirstButtonFrameForHeight(CGFloat height) {
 // Note [theEvent window] may not be our window, as we also get these messages
 // forwarded from BookmarkButton's mouse tracking loop.
 - (void)mouseMovedOrDragged:(NSEvent*)theEvent {
-  NSPoint eventScreenLocation =
-      [[theEvent window] convertBaseToScreen:[theEvent locationInWindow]];
+  NSPoint eventScreenLocation = ui::ConvertPointFromWindowToScreen(
+      [theEvent window], [theEvent locationInWindow]);
 
   // Base hot spot calculations on the positions of the scroll arrow views.
   NSRect testRect = [scrollDownArrowView_ frame];
   NSPoint testPoint = [visibleView_ convertPoint:testRect.origin
                                                   toView:nil];
-  testPoint = [[self window] convertBaseToScreen:testPoint];
+  testPoint = ui::ConvertPointFromWindowToScreen([self window], testPoint);
   CGFloat closeToTopOfScreen = testPoint.y;
 
   testRect = [scrollUpArrowView_ frame];
   testPoint = [visibleView_ convertPoint:testRect.origin toView:nil];
-  testPoint = [[self window] convertBaseToScreen:testPoint];
+  testPoint = ui::ConvertPointFromWindowToScreen([self window], testPoint);
   CGFloat closeToBottomOfScreen = testPoint.y + testRect.size.height;
   if (eventScreenLocation.y <= closeToBottomOfScreen &&
       ![scrollUpArrowView_ isHidden]) {