Remove ui/gfx/screen_type_delegate.h

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.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/android/webapps/add_to_homescreen_data_fetcher.h"
 
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
@@ skipping 95 matching lines @@
     const content::Manifest& manifest) {
   if (!web_contents() || !weak_observer_) return;
 
   if (!manifest.IsEmpty()) {
       content::RecordAction(
           base::UserMetricsAction("webapps.AddShortcut.Manifest"));
       shortcut_info_.UpdateFromManifest(manifest);
   }
 
   GURL icon_src = ManifestIconSelector::FindBestMatchingIcon(
-      manifest.icons,
-      ideal_icon_size_in_dp_,
-      minimum_icon_size_in_dp_,
-      gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
+      manifest.icons, ideal_icon_size_in_dp_, minimum_icon_size_in_dp_);
 
   // If fetching the Manifest icon fails, fallback to the best favicon
   // for the page.
   if (!ManifestIconDownloader::Download(
         web_contents(),
         icon_src,
         ideal_icon_size_in_dp_,
         minimum_icon_size_in_dp_,
         base::Bind(&AddToHomescreenDataFetcher::OnManifestIconFetched,
                    this))) {
     FetchFavicon();
   }
 
   // Save the splash screen URL for the later download.
   splash_screen_url_ = ManifestIconSelector::FindBestMatchingIcon(
-      manifest.icons,
-      ideal_splash_image_size_in_dp_,
-      minimum_splash_image_size_in_dp_,
-      gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
+      manifest.icons, ideal_splash_image_size_in_dp_,
+      minimum_splash_image_size_in_dp_);
 
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
   // Kick off a timeout for downloading the icon.  If an icon isn't set within
   // the timeout, fall back to using a dynamically-generated launcher icon.
   icon_timeout_timer_.Start(FROM_HERE,
                             base::TimeDelta::FromMilliseconds(3000),
                             base::Bind(
                                 &AddToHomescreenDataFetcher::OnFaviconFetched,
                                 this,
@@ skipping 41 matching lines @@
   std::vector<int> icon_types;
   icon_types.push_back(favicon_base::FAVICON);
   icon_types.push_back(favicon_base::TOUCH_PRECOMPOSED_ICON |
                        favicon_base::TOUCH_ICON);
   favicon::FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile,
                                            ServiceAccessType::EXPLICIT_ACCESS);
 
   // Using favicon if its size is not smaller than platform required size,
   // otherwise using the largest icon among all avaliable icons.
-  int ideal_icon_size_in_px = ideal_icon_size_in_dp_ *
-      gfx::Screen::GetScreenFor(web_contents()->GetNativeView())->
-          GetPrimaryDisplay().device_scale_factor();
+  int ideal_icon_size_in_px =
+      ideal_icon_size_in_dp_ *
+      gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
   int threshold_to_get_any_largest_icon = ideal_icon_size_in_px - 1;
   favicon_service->GetLargestRawFaviconForPageURL(
       shortcut_info_.url,
       icon_types,
       threshold_to_get_any_largest_icon,
       base::Bind(&AddToHomescreenDataFetcher::OnFaviconFetched, this),
       &favicon_task_tracker_);
 }
 
 void AddToHomescreenDataFetcher::OnFaviconFetched(
@@ skipping 63 matching lines @@
       dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(actual_url);
 
   // If URL points to an offline content, get original URL.
   GURL online_url = offline_pages::OfflinePageUtils::GetOnlineURLForOfflineURL(
       web_contents()->GetBrowserContext(), original_url);
   if (online_url.is_valid())
     return online_url;
 
   return original_url;
 }