Remove ui/gfx/screen_type_delegate.h

chrome/browser/manifest/manifest_icon_downloader.cc

 // Copyright 2015 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/manifest/manifest_icon_downloader.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 37 matching lines @@
 bool ManifestIconDownloader::Download(
     content::WebContents* web_contents,
     const GURL& icon_url,
     int ideal_icon_size_in_dp,
     int minimum_icon_size_in_dp,
     const ManifestIconDownloader::IconFetchCallback& callback) {
   DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
   if (!web_contents || !icon_url.is_valid())
     return false;
 
-  const gfx::Screen* screen =
-      gfx::Screen::GetScreenFor(web_contents->GetNativeView());
-
+  const gfx::Screen* screen = gfx::Screen::GetScreen();

[oshima, 2016/01/19 20:44:31]

inline?

[scottmg, 2016/01/19 21:55:57]

Done.

   const float device_scale_factor =
       screen->GetPrimaryDisplay().device_scale_factor();
   const int ideal_icon_size_in_px =
       static_cast<int>(round(ideal_icon_size_in_dp * device_scale_factor));
   const int minimum_icon_size_in_px =
       static_cast<int>(round(minimum_icon_size_in_dp * device_scale_factor));
 
   web_contents->DownloadImage(
       icon_url,
       false, // is_favicon
@@ skipping 125 matching lines @@
     float ratio = height / width;
     float ratio_difference = fabs(ratio - 1);
     if (ratio_difference < best_ratio_difference) {
       best_index = i;
       best_ratio_difference = ratio_difference;
     }
   }
 
   return best_index;
 }