Simplify calls for scale factor

ui/snapshot/snapshot_android.cc

 // 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/snapshot/snapshot.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/task_runner.h"
 #include "cc/output/copy_output_request.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/android/window_android_compositor.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
+#include "ui/base/layout.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/snapshot/snapshot_async.h"
 
 namespace ui {
 
 // Sync versions are not supported in Android.  Callers should fall back
 // to the async version.
 bool GrabViewSnapshot(gfx::NativeView view,
                       const gfx::Rect& snapshot_bounds,
                       gfx::Image* image) {
   return GrabWindowSnapshot(view->GetWindowAndroid(), snapshot_bounds, image);
 }
 
 bool GrabWindowSnapshot(gfx::NativeWindow window,
                         const gfx::Rect& snapshot_bounds,
                         gfx::Image* image) {
   return false;
 }
 
 static void MakeAsyncCopyRequest(
     gfx::NativeWindow window,
     const gfx::Rect& source_rect,
     const cc::CopyOutputRequest::CopyOutputRequestCallback& callback) {
   std::unique_ptr<cc::CopyOutputRequest> request =
       cc::CopyOutputRequest::CreateBitmapRequest(callback);
 
-  const display::Display& display =
-      display::Screen::GetScreen()->GetDisplayNearestWindow(window);
-  float scale = display.device_scale_factor();
+  float scale = ui::GetScaleFactorForNativeView(window);
   request->set_area(gfx::ScaleToEnclosingRect(source_rect, scale));
   window->GetCompositor()->RequestCopyOfOutputOnRootLayer(std::move(request));
 }
 
 void GrabWindowSnapshotAndScaleAsync(
     gfx::NativeWindow window,
     const gfx::Rect& source_rect,
     const gfx::Size& target_size,
     scoped_refptr<base::TaskRunner> background_task_runner,
     const GrabWindowSnapshotAsyncCallback& callback) {
@@ skipping 15 matching lines @@
 
 void GrabViewSnapshotAsync(gfx::NativeView view,
                            const gfx::Rect& source_rect,
                            const GrabWindowSnapshotAsyncCallback& callback) {
   MakeAsyncCopyRequest(
       view->GetWindowAndroid(), source_rect,
       base::Bind(&SnapshotAsync::RunCallbackWithCopyOutputResult, callback));
 }
 
 }  // namespace ui