Update WebApkInstaller to support badge icon in installation.

chrome/browser/android/banners/app_banner_infobar_delegate_android.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/banners/app_banner_infobar_delegate_android.h"
 

[dominickn, 2017/04/04 05:25:33]

#include <utility> for std::move

[F, 2017/04/04 15:21:26]

Done.

 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/shortcut_info.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "chrome/browser/banners/app_banner_manager.h"
@@ skipping 26 matching lines @@
 }  // anonymous namespace
 
 namespace banners {
 
 // static
 bool AppBannerInfoBarDelegateAndroid::Create(
     content::WebContents* web_contents,
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
-    std::unique_ptr<SkBitmap> icon,
+    const SkBitmap& primary_icon,
+    const SkBitmap& badge_icon,
     int event_request_id,
     webapk::InstallSource webapk_install_source) {
   bool is_webapk = ChromeWebApkHost::CanInstallWebApk();
   const GURL url = shortcut_info->url;
   auto infobar_delegate =
       base::WrapUnique(new banners::AppBannerInfoBarDelegateAndroid(
-          weak_manager, app_title, std::move(shortcut_info), std::move(icon),
-          event_request_id, is_webapk, webapk_install_source));
+          weak_manager, app_title, std::move(shortcut_info), primary_icon,
+          badge_icon, event_request_id, is_webapk, webapk_install_source));
   auto* raw_delegate = infobar_delegate.get();
   auto infobar = base::MakeUnique<AppBannerInfoBarAndroid>(
       std::move(infobar_delegate), url, is_webapk);
   if (!InfoBarService::FromWebContents(web_contents)
            ->AddInfoBar(std::move(infobar)))
     return false;
 
   if (is_webapk) {
     if (webapk_install_source == webapk::INSTALL_SOURCE_MENU) {
       webapk::TrackInstallInfoBarShown(
           webapk::WEBAPK_INFOBAR_SHOWN_FROM_MENU);
       raw_delegate->Accept();
     } else {
       webapk::TrackInstallInfoBarShown(
           webapk::WEBAPK_INFOBAR_SHOWN_FROM_BANNER);
     }
   }
 
   return true;
 }
 
 // static
 bool AppBannerInfoBarDelegateAndroid::Create(
     content::WebContents* web_contents,
     const base::string16& app_title,
     const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
-    std::unique_ptr<SkBitmap> icon,
+    const SkBitmap& icon,
     const std::string& native_app_package,
     const std::string& referrer,
     int event_request_id) {
   auto infobar_delegate = base::WrapUnique(new AppBannerInfoBarDelegateAndroid(
-      app_title, native_app_data, std::move(icon), native_app_package, referrer,
+      app_title, native_app_data, icon, native_app_package, referrer,
       event_request_id));
   return InfoBarService::FromWebContents(web_contents)
       ->AddInfoBar(base::MakeUnique<AppBannerInfoBarAndroid>(
            std::move(infobar_delegate), native_app_data));
 }
 
 AppBannerInfoBarDelegateAndroid::~AppBannerInfoBarDelegateAndroid() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   if (!has_user_interaction_) {
@@ skipping 96 matching lines @@
   Java_AppBannerInfoBarDelegateAndroid_setWebApkPackageName(
       env, java_delegate_, java_webapk_package_name);
   UpdateInstallState(env, nullptr);
   install_state_ = INSTALLED;
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
-    std::unique_ptr<SkBitmap> icon,
+    const SkBitmap& primary_icon,
+    const SkBitmap& badge_icon,
     int event_request_id,
     bool is_webapk,
     webapk::InstallSource webapk_install_source)
     : weak_manager_(weak_manager),
       app_title_(app_title),
       shortcut_info_(std::move(shortcut_info)),
-      icon_(std::move(icon)),
+      primary_icon_(primary_icon),
+      badge_icon_(badge_icon),
       event_request_id_(event_request_id),
       has_user_interaction_(false),
       is_webapk_(is_webapk),
       install_state_(INSTALL_NOT_STARTED),
       webapk_install_source_(webapk_install_source),
       weak_ptr_factory_(this) {
   DCHECK(!IsInfoEmpty(shortcut_info_));
   CreateJavaDelegate();
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     const base::string16& app_title,
     const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
-    std::unique_ptr<SkBitmap> icon,
+    const SkBitmap& icon,
     const std::string& native_app_package,
     const std::string& referrer,
     int event_request_id)
     : app_title_(app_title),
       native_app_data_(native_app_data),
-      icon_(std::move(icon)),
+      primary_icon_(icon),
       native_app_package_(native_app_package),
       referrer_(referrer),
       event_request_id_(event_request_id),
       has_user_interaction_(false),
       weak_ptr_factory_(this) {
   DCHECK(!native_app_data_.is_null());
   CreateJavaDelegate();
 }
 
 void AppBannerInfoBarDelegateAndroid::CreateJavaDelegate() {
@@ skipping 29 matching lines @@
 bool AppBannerInfoBarDelegateAndroid::AcceptWebApp(
     content::WebContents* web_contents) {
   if (IsInfoEmpty(shortcut_info_))
     return true;
   TrackUserResponse(USER_RESPONSE_WEB_APP_ACCEPTED);
 
   AppBannerSettingsHelper::RecordBannerInstallEvent(
       web_contents, shortcut_info_->url.spec(), AppBannerSettingsHelper::WEB);
 
   ShortcutHelper::AddToLauncherWithSkBitmap(web_contents, *shortcut_info_,
-                                            *icon_.get());
+                                            primary_icon_);
 
   SendBannerAccepted();
   return true;
 }
 
 bool AppBannerInfoBarDelegateAndroid::AcceptWebApk(
     content::WebContents* web_contents) {
   if (IsInfoEmpty(shortcut_info_))
     return true;
 
@@ skipping 27 matching lines @@
         AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
         AppBannerManager::GetCurrentTime());
   }
 
   Java_AppBannerInfoBarDelegateAndroid_setWebApkInstallingState(
       env, java_delegate_, true);
   UpdateInstallState(env, nullptr);
   WebApkInstallService::FinishCallback callback =
       base::Bind(&AppBannerInfoBarDelegateAndroid::OnWebApkInstallFinished,
                  weak_ptr_factory_.GetWeakPtr());
-  ShortcutHelper::InstallWebApkWithSkBitmap(web_contents, *shortcut_info_,
-                                            *icon_.get(), callback);
+  ShortcutHelper::InstallWebApkWithSkBitmap(
+      web_contents, *shortcut_info_, primary_icon_, badge_icon_, callback);
+
   SendBannerAccepted();
 
   // Prevent the infobar from disappearing, because the infobar will show
   // "Adding" during the installation process.
   return false;
 }
 
 bool AppBannerInfoBarDelegateAndroid::TriggeredFromBanner() const {
   return !is_webapk_ || webapk_install_source_ == webapk::INSTALL_SOURCE_BANNER;
 }
@@ skipping 25 matching lines @@
     return;
 
   // If the install didn't definitely fail, we don't add a shortcut. This could
   // happen if Play was busy with another install and this one is still queued
   // (and hence might succeed in the future).
   if (result == WebApkInstallResult::FAILURE) {
     content::WebContents* web_contents =
         InfoBarService::WebContentsFromInfoBar(infobar());
     // Add webapp shortcut to the homescreen.
     ShortcutHelper::AddToLauncherWithSkBitmap(web_contents, *shortcut_info_,
-                                              *icon_.get());
+                                              primary_icon_);
   }
 
   infobar()->RemoveSelf();
 }
 
 void AppBannerInfoBarDelegateAndroid::TrackWebApkInstallationDismissEvents(
     InstallState install_state) {
   if (install_state == INSTALL_NOT_STARTED) {
     webapk::TrackInstallEvent(webapk::INFOBAR_DISMISSED_BEFORE_INSTALLATION);
   } else if (install_state == INSTALLING) {
     webapk::TrackInstallEvent(webapk::INFOBAR_DISMISSED_DURING_INSTALLATION);
   } else if (install_state == INSTALLED) {
     // If WebAPK is installed from this banner, TrackInstallEvent() is called in
     // WebApkInstaller::OnResult().
     webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN_DISMISS);
   }
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 AppBannerInfoBarDelegateAndroid::GetIdentifier() const {
   return APP_BANNER_INFOBAR_DELEGATE_ANDROID;
 }
 
 gfx::Image AppBannerInfoBarDelegateAndroid::GetIcon() const {
-  return gfx::Image::CreateFrom1xBitmap(*icon_.get());
+  return gfx::Image::CreateFrom1xBitmap(primary_icon_);
 }
 
 void AppBannerInfoBarDelegateAndroid::InfoBarDismissed() {
   has_user_interaction_ = true;
 
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
 
   if (weak_manager_ && TriggeredFromBanner())
     weak_manager_->SendBannerDismissed(event_request_id_);
@@ skipping 40 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners