Reland "Add display::GetDisplayNearestView"

ui/display/mac/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/display/screen.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
@@ skipping 135 matching lines @@
     NOTIMPLEMENTED();
     return gfx::NativeWindow();
   }
 
   int GetNumDisplays() const override { return GetAllDisplays().size(); }
 
   const std::vector<Display>& GetAllDisplays() const override {
     return displays_;
   }
 
-  Display GetDisplayNearestWindow(gfx::NativeView view) const override {
+  Display GetDisplayNearestWindow(gfx::NativeWindow window) const override {
     EnsureDisplaysValid();
     if (displays_.size() == 1)
       return displays_[0];
 
-    NSWindow* window = nil;
-#if !defined(USE_AURA)
-    if (view)
-      window = [view window];
-#endif
     if (!window)
       return GetPrimaryDisplay();
 
     // Note the following line calls -[NSWindow
     // _bestScreenBySpaceAssignmentOrGeometry] which is quite expensive and
     // performs IPC with the window server process.
     NSScreen* match_screen = [window screen];
 
     if (!match_screen)
       return GetPrimaryDisplay();
@@ skipping 146 matching lines @@
   // The timer to delay configuring outputs and notifying observers.
   base::Timer configure_timer_;
 
   DisplayChangeNotifier change_notifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenMac);
 };
 
 }  // namespace
 
+// static
+gfx::NativeWindow Screen::GetWindowForView(gfx::NativeView view) {
+  NSWindow* window = nil;
+#if !defined(USE_AURA)
+  window = [view window];
+#endif
+  return window;
+}
+
 #if !defined(USE_AURA)
 Screen* CreateNativeScreen() {
   return new ScreenMac;
 }
 #endif
 
 }  // namespace display