Reland "Add display::GetDisplayNearestView"

ui/message_center/views/toast_contents_view.cc

 // Copyright (c) 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 "ui/message_center/views/toast_contents_view.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 244 matching lines @@
 void ToastContentsView::OnDisplayChanged() {
   views::Widget* widget = GetWidget();
   if (!widget)
     return;
 
   gfx::NativeView native_view = widget->GetNativeView();
   if (!native_view || !collection_.get())
     return;
 
   collection_->OnDisplayMetricsChanged(
-      Screen::GetScreen()->GetDisplayNearestWindow(native_view));
+      Screen::GetScreen()->GetDisplayNearestView(native_view));
 }
 
 void ToastContentsView::OnWorkAreaChanged() {
   views::Widget* widget = GetWidget();
   if (!widget)
     return;
 
   gfx::NativeView native_view = widget->GetNativeView();
   if (!native_view || !collection_.get())
     return;
 
   collection_->OnDisplayMetricsChanged(
-      Screen::GetScreen()->GetDisplayNearestWindow(native_view));
+      Screen::GetScreen()->GetDisplayNearestView(native_view));
 }
 
 // views::View
 void ToastContentsView::OnMouseEntered(const ui::MouseEvent& event) {
   if (collection_)
     collection_->OnMouseEntered(this);
 }
 
 void ToastContentsView::OnMouseExited(const ui::MouseEvent& event) {
   if (collection_)
@@ skipping 113 matching lines @@
 }
 
 gfx::Rect ToastContentsView::GetClosedToastBounds(gfx::Rect bounds) {
   return gfx::Rect(bounds.x() + bounds.width() - kClosedToastWidth,
                    bounds.y(),
                    kClosedToastWidth,
                    bounds.height());
 }
 
 }  // namespace message_center