Fix mistmached |GetDisplayNearest{Window,View}| param type

ash/laser/laser_pointer_view.cc

 // Copyright 2016 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 "ash/laser/laser_pointer_view.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 16 matching lines @@
 #include "cc/resources/transferable_resource.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkTypes.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
+#include "ui/base/layout.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 // Variables for rendering the laser. Radius in DIP.
@@ skipping 183 matching lines @@
   params.parent =
       Shell::GetContainer(root_window, kShellWindowId_OverlayContainer);
   params.layer_type = ui::LAYER_SOLID_COLOR;
 
   widget_->Init(params);
   widget_->Show();
   widget_->SetContentsView(this);
   widget_->SetBounds(root_window->GetBoundsInScreen());
   set_owned_by_client();
 
-  scale_factor_ = display::Screen::GetScreen()
-                      ->GetDisplayNearestWindow(widget_->GetNativeView())
-                      .device_scale_factor();
+  scale_factor_ = ui::GetScaleFactorForNativeView(widget_->GetNativeView());
 }
 
 LaserPointerView::~LaserPointerView() {}
 
 void LaserPointerView::Stop() {
   buffer_damage_rect_.Union(GetBoundingBox());
   laser_points_.Clear();
   predicted_laser_points_.Clear();
   OnPointsUpdated();
 }
@@ skipping 468 matching lines @@
   pending_draw_surface_ = true;
 }
 
 void LaserPointerView::OnDidDrawSurface() {
   pending_draw_surface_ = false;
   if (needs_update_surface_)
     UpdateSurface();
 }
 
 }  // namespace ash