Reland "Add display::GetDisplayNearestView"

chrome/browser/ui/views/validation_message_bubble_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 "chrome/browser/ui/views/validation_message_bubble_view.h"
 
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 const int kWindowMinWidth = 64;
 const int kWindowMaxWidth = 256;
 const int kIconTextMargin = 8;
 const int kTextVerticalMargin = 4;
@@ skipping 57 matching lines @@
   views::BubbleDialogDelegateView::CreateBubble(this)->ShowInactive();
 }
 
 ValidationMessageBubbleView::~ValidationMessageBubbleView() {
 }
 
 gfx::Rect ValidationMessageBubbleView::RootViewToScreenRect(
     const gfx::Rect& rect_in_root_view,
     const content::RenderWidgetHostView* render_widget_host_view) const {
   gfx::NativeView view = render_widget_host_view->GetNativeView();
-  display::Display display =
-      display::Screen::GetScreen()->GetDisplayNearestWindow(view);
-  const float scale = display.device_scale_factor();
+  const float scale = ui::GetScaleFactorForNativeView(view);
   return gfx::ScaleToEnclosingRect(rect_in_root_view, 1 / scale) +
          render_widget_host_view->GetViewBounds().origin().OffsetFromOrigin();
 }
 
 gfx::Size ValidationMessageBubbleView::GetPreferredSize() const {
   return size_;
 }
 
 int ValidationMessageBubbleView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
 void ValidationMessageBubbleView::SetPositionRelativeToAnchor(
     content::RenderWidgetHost* widget_host,
     const gfx::Rect& anchor_in_root_view) {
   SetAnchorRect(
       RootViewToScreenRect(anchor_in_root_view, widget_host->GetView()));
 }
 
 void ValidationMessageBubbleView::CloseValidationMessage() {
   GetWidget()->Close();
 }