MacViews: Implement Tab Dragging

ui/gfx/screen_mac.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.
 
 #include "ui/gfx/screen.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/display_change_notifier.h"
+#include "ui/gfx/mac/coordinate_conversion.h"
 
 namespace {
 
 // The delay to handle the display configuration changes.
 // See comments in ScreenMac::HandleDisplayReconfiguration.
 const int64_t kConfigureDelayMs = 500;
 
 gfx::Rect ConvertCoordinateSystem(NSRect ns_rect) {

[tapted, 2016/03/01 08:11:58]

this function isn't needed any more -- can just call
gfx::ScreenRectFromNSRect(ns_rect) at the call sites

-  // Primary monitor is defined as the monitor with the menubar,
-  // which is always at index 0.
-  NSScreen* primary_screen = [[NSScreen screens] firstObject];
-  float primary_screen_height = [primary_screen frame].size.height;
-  gfx::Rect rect(NSRectToCGRect(ns_rect));
-  rect.set_y(primary_screen_height - rect.y() - rect.height());
-  return rect;
+  return gfx::ScreenRectFromNSRect(ns_rect);
 }
 
 NSScreen* GetMatchingScreen(const gfx::Rect& match_rect) {
   // Default to the monitor with the current keyboard focus, in case
   // |match_rect| is not on any screen at all.
   NSScreen* max_screen = [NSScreen mainScreen];
   int max_area = 0;
 
   for (NSScreen* screen in [NSScreen screens]) {
     gfx::Rect monitor_area = ConvertCoordinateSystem([screen frame]);
@@ skipping 54 matching lines @@
   }
 
   ~ScreenMac() override {
     CGDisplayRemoveReconfigurationCallback(
         ScreenMac::DisplayReconfigurationCallBack, this);
   }
 
   gfx::Point GetCursorScreenPoint() override {
     NSPoint mouseLocation  = [NSEvent mouseLocation];
     // Flip coordinates to gfx (0,0 in top-left corner) using primary screen.
-    NSScreen* screen = [[NSScreen screens] firstObject];
-    mouseLocation.y = NSMaxY([screen frame]) - mouseLocation.y;
-    return gfx::Point(mouseLocation.x, mouseLocation.y);
+    return gfx::ScreenPointFromNSPoint(mouseLocation);

[tapted, 2016/03/01 08:11:58]

nit: can just pass [NSEvent mouseLocation]; in on this line

   }
 
   gfx::NativeWindow GetWindowUnderCursor() override {
     NOTIMPLEMENTED();
     return gfx::NativeWindow();
   }
 
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
     NOTIMPLEMENTED();
     return gfx::NativeWindow();
@@ skipping 154 matching lines @@
 
 namespace gfx {
 
 #if !defined(USE_AURA)
 Screen* CreateNativeScreen() {
   return new ScreenMac;
 }
 #endif
 
 }