Update WebApkInstaller to support badge icon in installation.

chrome/browser/android/banners/app_banner_infobar_delegate_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
 
 #include <memory>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/android/webapk/webapk_metrics.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace infobars {
 class InfoBarManager;
 }
 
 enum class WebApkInstallResult;
 struct ShortcutInfo;
 
 namespace banners {
 
 class AppBannerManager;
 
 // Manages installation of an app being promoted by a page.
 class AppBannerInfoBarDelegateAndroid : public ConfirmInfoBarDelegate {
  public:
   // Creates an infobar and delegate for promoting the installation of a web
   // app, and adds the infobar to the InfoBarManager for |web_contents|.
-  static bool Create(
-      content::WebContents* web_contents,
-      base::WeakPtr<AppBannerManager> weak_manager,
-      const base::string16& app_title,
-      std::unique_ptr<ShortcutInfo> info,
-      std::unique_ptr<SkBitmap> icon,
-      int event_request_id,
-      webapk::InstallSource webapk_install_source);
+  static bool Create(content::WebContents* web_contents,
+                     base::WeakPtr<AppBannerManager> weak_manager,
+                     const base::string16& app_title,
+                     std::unique_ptr<ShortcutInfo> info,
+                     const SkBitmap& primary_icon,
+                     const SkBitmap& badge_icon,
+                     int event_request_id,
+                     webapk::InstallSource webapk_install_source);
 
   // Creates an infobar and delegate for promoting the installation of an
   // Android app, and adds the infobar to the InfoBarManager for |web_contents|.
   static bool 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);
 
   ~AppBannerInfoBarDelegateAndroid() override;
 
   // Called when the AppBannerInfoBarAndroid's button needs to be updated.
   void UpdateInstallState(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj);
 
@@ skipping 22 matching lines @@
     INSTALL_NOT_STARTED,
     INSTALLING,
     INSTALLED,
   };
 
   // Delegate for promoting a web app.
   AppBannerInfoBarDelegateAndroid(
       base::WeakPtr<AppBannerManager> weak_manager,
       const base::string16& app_title,
       std::unique_ptr<ShortcutInfo> 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);
 
   // Delegate for promoting an Android app.
   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);
 
   void CreateJavaDelegate();
   bool AcceptNativeApp(content::WebContents* web_contents);
   bool AcceptWebApp(content::WebContents* web_contents);
 
   // Called when the OK button on a WebAPK infobar is pressed. If the WebAPK is
   // already installed, opens it; otherwise, installs it. Returns whether the
@@ skipping 24 matching lines @@
   base::android::ScopedJavaGlobalRef<jobject> java_delegate_;
 
   // Used to fetch the splash screen icon for webapps.
   base::WeakPtr<AppBannerManager> weak_manager_;
 
   base::string16 app_title_;
   std::unique_ptr<ShortcutInfo> shortcut_info_;
 
   base::android::ScopedJavaGlobalRef<jobject> native_app_data_;
 
-  std::unique_ptr<SkBitmap> icon_;
+  const SkBitmap primary_icon_;
+  const SkBitmap badge_icon_;
 
   std::string native_app_package_;
   std::string referrer_;
   int event_request_id_;
   bool has_user_interaction_;
 
   bool is_webapk_;
 
   // Indicates the current state of a WebAPK installation.
   InstallState install_state_;
 
   // Indicates the way in which a WebAPK (if applicable) is installed: from the
   // menu or from an app banner.
   webapk::InstallSource webapk_install_source_;
 
   base::WeakPtrFactory<AppBannerInfoBarDelegateAndroid> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppBannerInfoBarDelegateAndroid);
 };
 
 // Register native methods.
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env);
 
 }  // namespace banners
 
 #endif  // CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_