Break out manifest icon logic from ShortcutHelper

chrome/browser/android/banners/app_banner_manager.cc

 // Copyright 2014 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/banners/app_banner_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
 #include "chrome/browser/android/banners/app_banner_metrics_ids.h"
 #include "chrome/browser/android/banners/app_banner_utilities.h"
+#include "chrome/browser/android/manifest_icon_selector.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/manifest.h"
 #include "jni/AppBannerManager_jni.h"
 #include "net/base/load_flags.h"
 #include "ui/gfx/android/java_bitmap.h"
+#include "ui/gfx/screen.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
 namespace {
 const char kBannerTag[] = "google-play-id";
 }
 
 namespace banners {
@@ skipping 91 matching lines @@
                                                   kBannerTag));
     return;
   }
 
   // TODO(benwells): Check triggering parameters here and if there is a meta
   // tag.
 
   // Create an infobar to promote the manifest's app.
   manifest_ = manifest;
 
-  /* TODO(dfalcantara): Use after landing https://crrev.com/880203004.
   GURL icon_url =
-      ManifestIconSelector::FindBestMatchingIcon(manifest.icons,
-                                                 GetPreferredIconSize(),
-                                                 web_contents());
+      ManifestIconSelector::FindBestMatchingIcon(
+          manifest.icons,
+          GetPreferredIconSize(),
+          gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
   if (icon_url.is_empty())
     return;
-  */
-  if (manifest.icons.empty())
-    return;
-  GURL icon_url = manifest.icons.back().src;
 
   FetchIcon(icon_url);
 }
 
 bool AppBannerManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AppBannerManager, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidRetrieveMetaTagContent,
                         OnDidRetrieveMetaTagContent)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ skipping 122 matching lines @@
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableAppInstallAlerts);
 }
 
 // Register native methods
 bool RegisterAppBannerManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners