Reland "Add display::GetDisplayNearestView"

chrome/browser/chromeos/display/output_protection_delegate.cc

 // Copyright 2013 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 "chrome/browser/chromeos/display/output_protection_delegate.h"
 
 #include "chrome/browser/chromeos/display/output_protection_controller_ash.h"
 #include "chrome/browser/chromeos/display/output_protection_controller_mus.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/display/types/display_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64_t* display_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(rfh);
   DCHECK(display_id);
 
   display::Screen* screen = display::Screen::GetScreen();
   if (!screen)
     return false;
   display::Display display =
-      screen->GetDisplayNearestWindow(rfh->GetNativeView());
+      screen->GetDisplayNearestView(rfh->GetNativeView());
   *display_id = display.id();
   return true;
 }
 
 void DoNothing(bool status) {
 }
 
 }  // namespace
 
 OutputProtectionDelegate::Controller::Controller() {}
@@ skipping 100 matching lines @@
   display_id_ = new_display_id;
 }
 
 void OutputProtectionDelegate::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window, window_);
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace chromeos