Prepare ui/ module for compilation with OS X 10.7 deployment target.

ui/views/cocoa/widget_owner_nswindow_adapter.mm

 // Copyright 2015 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 "ui/views/cocoa/widget_owner_nswindow_adapter.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 // Bridges an AppKit observer to observe when the (non-views) NSWindow owning a
 // views::Widget will close.
 @interface WidgetOwnerNSWindowAdapterBridge : NSObject {
  @private
   views::WidgetOwnerNSWindowAdapter* adapter_;  // Weak. Owns us.
@@ skipping 47 matching lines @@
 
 NSWindow* WidgetOwnerNSWindowAdapter::GetNSWindow() {
   return anchor_window_;
 }
 
 gfx::Vector2d WidgetOwnerNSWindowAdapter::GetChildWindowOffset() const {
   NSRect rect_in_window =
       [anchor_view_ convertRect:[anchor_view_ bounds] toView:nil];
   // Ensure we anchor off the top-left of |anchor_view_| (rect_in_window.origin
   // is the bottom-left of the view).
-  // TODO(tapted): Use -[NSWindow convertRectToScreen:] when we ditch 10.6.
   NSRect rect_in_screen = NSZeroRect;
-  rect_in_screen.origin =
-      [anchor_window_ convertBaseToScreen:NSMakePoint(NSMinX(rect_in_window),
-                                                      NSMaxY(rect_in_window))];
+  rect_in_screen.origin = ui::ConvertPointFromWindowToScreen(
+      anchor_window_,
+      NSMakePoint(NSMinX(rect_in_window), NSMaxY(rect_in_window)));

[Avi (use Gerrit), 2016/03/08 20:07:54]

Can we rewrite this so we do:

NSRect rect_in_window = ...
NSRect rect_in_screen = [anchor_window_ convertRectToScreen:rect_in_window];

and _then_ fiddle with the origin? If it's not too much work, that would be
cleaner.

[erikchen, 2016/03/08 20:57:41]

Done.

   return gfx::ScreenRectFromNSRect(rect_in_screen).OffsetFromOrigin();
 }
 
 bool WidgetOwnerNSWindowAdapter::IsVisibleParent() const {
   return [anchor_window_ isVisible];
 }
 
 void WidgetOwnerNSWindowAdapter::RemoveChildWindow(BridgedNativeWidget* child) {
   DCHECK_EQ(child, child_);
   [GetNSWindow() removeChildWindow:child->ns_window()];
   delete this;
 }
 
 WidgetOwnerNSWindowAdapter::~WidgetOwnerNSWindowAdapter() {
   [[NSNotificationCenter defaultCenter] removeObserver:observer_bridge_];
 }
 
 }  // namespace views