Update WebApkInstaller to support badge icon in installation.

chrome/browser/android/webapk/webapk_installer.h

 // Copyright 2016 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_WEBAPK_WEBAPK_INSTALLER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_
 
 #include <jni.h>
 #include <map>
 #include <memory>
@@ skipping 31 matching lines @@
   using FinishCallback = WebApkInstallService::FinishCallback;
 
   ~WebApkInstaller() override;
 
   // Creates a self-owned WebApkInstaller instance and talks to the Chrome
   // WebAPK server to generate a WebAPK on the server and to Google Play to
   // install the downloaded WebAPK. Calls |callback| once the install completed
   // or failed.
   static void InstallAsync(content::BrowserContext* context,
                            const ShortcutInfo& shortcut_info,
-                           const SkBitmap& shortcut_icon,
+                           const SkBitmap& primary_icon,
+                           const SkBitmap& badge_icon,
                            const FinishCallback& finish_callback);
 
+  // TODO(zpeng): Add badge icon to WebAPK update route.
   // Creates a self-owned WebApkInstaller instance and talks to the Chrome
   // WebAPK server to update a WebAPK on the server and to the Google Play
   // server to install the downloaded WebAPK. Calls |callback| after the request
   // to install the WebAPK is sent to the Google Play server.
   static void UpdateAsync(
       content::BrowserContext* context,
       const ShortcutInfo& shortcut_info,
-      const SkBitmap& shortcut_icon,
+      const SkBitmap& primary_icon,
       const std::string& webapk_package,
       int webapk_version,
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
       bool is_manifest_stale,
       const FinishCallback& callback);
 
   // Calls the private function |InstallAsync| for testing.
   // Should be used only for testing.
   static void InstallAsyncForTesting(WebApkInstaller* installer,
                                      const FinishCallback& finish_callback);
@@ skipping 22 matching lines @@
       const base::Callback<void(std::unique_ptr<webapk::WebApk>)>& callback,
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
       bool is_manifest_stale);
 
   // Registers JNI hooks.
   static bool Register(JNIEnv* env);
 
  protected:
   WebApkInstaller(content::BrowserContext* browser_context,
                   const ShortcutInfo& shortcut_info,
-                  const SkBitmap& shortcut_icon);
+                  const SkBitmap& primary_icon,
+                  const SkBitmap& badge_icon);
 
   // Starts installion of the downloaded WebAPK.
   // |file_path| is the file path that the WebAPK was downloaded to.
   // |package_name| is the package name of the WebAPK.
   virtual void InstallDownloadedWebApk(
       JNIEnv* env,
       const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
       const base::android::ScopedJavaLocalRef<jstring>& java_package_name);
 
   // Starts update using the downloaded WebAPK.
@@ skipping 36 matching lines @@
   void UpdateAsync(
       const std::string& webapk_package,
       int webapk_version,
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
       bool is_manifest_stale,
       const FinishCallback& callback);
 
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
-  // Called with the computed Murmur2 hash for the app icon.
-  void OnGotIconMurmur2Hash(const std::string& icon_murmur2_hash);
+  // Called with the computed Murmur2 hash for the primary icon.
+  void OnGotPrimaryIconMurmur2Hash(const std::string& primary_icon_hash);
+
+  // Called with the computed Murmur2 hash for the badge icon, and
+  // |did_fetch_badge_icon| to indicate whether there is an attempt to fetch
+  // badge icon.
+  void OnGotBadgeIconMurmur2Hash(bool did_fetch_badge_icon,
+                                 const std::string& badge_icon_hash);
 
   // Sends request to WebAPK server to create WebAPK. During a successful
   // request the WebAPK server responds with the URL of the generated WebAPK.
   // |webapk| is the proto to send to the WebAPK server.
   void SendCreateWebApkRequest(std::unique_ptr<webapk::WebApk> webapk_proto);
 
   // Sends request to WebAPK server to update a WebAPK. During a successful
   // request the WebAPK server responds with the URL of the generated WebAPK.
   // |webapk| is the proto to send to the WebAPK server.
   void SendUpdateWebApkRequest(std::unique_ptr<webapk::WebApk> webapk_proto);
@@ skipping 51 matching lines @@
 
   // Tracks how long it takes to install a WebAPK.
   std::unique_ptr<base::ElapsedTimer> install_duration_timer_;
 
   // Callback to call once WebApkInstaller succeeds or fails.
   FinishCallback finish_callback_;
 
   // Web Manifest info.
   const ShortcutInfo shortcut_info_;
 
-  // WebAPK app icon.
-  const SkBitmap shortcut_icon_;
+  // WebAPK primary icon & its Murmur2 hash.
+  const SkBitmap primary_icon_;
+  std::string primary_icon_hash_;

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

Instead of having primary_icon_hash_ and badge_icon_hash_ as members, can you
add a std::string |primary_icon_hash| argument to OnGotBadgeIconMurmur2Hash()?
Then you don't need these, since |badge_icon_hash_| is set and then used in the
same method (and neither are touched again).

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

Done.

+
+  // WebAPK badge icon & its Murmur2 hash.
+  const SkBitmap badge_icon_;
+  std::string badge_icon_hash_;
 
   // WebAPK server URL.
   GURL server_url_;
 
   // The number of milliseconds to wait for the WebAPK download URL from the
   // WebAPK server.
   int webapk_download_url_timeout_ms_;
 
   // The number of milliseconds to wait for the WebAPK download to complete.
   int download_timeout_ms_;
@@ skipping 13 matching lines @@
   // Points to the Java Object.
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   // Used to get |weak_ptr_|.
   base::WeakPtrFactory<WebApkInstaller> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstaller);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_