Update AddToHomescreenDataFetcher to accept badge icon for WebAPK.

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.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_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 41 matching lines @@
 
     // Converts the icon into one that can be used on the Android Home screen.
     // |is_generated| is an out-param that indicates whether the icon was
     // generated by Chrome.
     virtual SkBitmap FinalizeLauncherIconInBackground(const SkBitmap& icon,
                                                       const GURL& url,
                                                       bool* is_generated) = 0;
 
     // Called when all the data needed to create a shortcut is available.
     virtual void OnDataAvailable(const ShortcutInfo& info,
-                                 const SkBitmap& icon) = 0;
+                                 const SkBitmap& icon,

[dominickn, 2017/02/02 19:16:50]

primary_icon?
badge_icon?

[F, 2017/02/02 21:05:51]

Done.

+                                 const SkBitmap& badge) = 0;
 
-    protected:
-     virtual ~Observer() {}
+   protected:
+    virtual ~Observer() {}
   };
 
   // Initialize the fetcher by requesting the information about the page from
   // the renderer process. The initialization is asynchronous and
   // OnDidGetWebApplicationInfo is expected to be called when finished.
   AddToHomescreenDataFetcher(content::WebContents* web_contents,
                              int ideal_icon_size_in_px,
                              int minimum_icon_size_in_px,
                              int ideal_splash_image_size_in_px,
                              int minimum_splash_image_size_in_px,
+                             int ideal_badge_size_in_px,
+                             int minimum_badge_size_in_px,
                              bool check_webapk_compatible,
                              Observer* observer);
 
   // Returns a callback which fetches the splash screen image to be stored for
   // the webapp with the specified |id|.
   base::Closure FetchSplashScreenImageCallback(const std::string& id);
 
   // IPC message received when the initialization is finished.
   void OnDidGetWebApplicationInfo(const WebApplicationInfo& web_app_info);
 
@@ skipping 31 matching lines @@
   // Creates the launcher icon from the given |raw_icon|.
   void CreateLauncherIcon(const SkBitmap& raw_icon);
   void CreateLauncherIconInBackground(const SkBitmap& raw_icon);
 
   // Notifies the observer that the shortcut data is all available.
   void NotifyObserver(const SkBitmap& icon);
 
   Observer* weak_observer_;
 
   // The icon must only be set on the UI thread for thread safety.
   SkBitmap shortcut_icon_;

[dominickn, 2017/02/02 19:16:50]

primary_icon_?
badge_icon?

[F, 2017/02/02 21:05:51]

Done.

[dominickn, 2017/02/02 21:17:11]

I don't think we need the shortcut_ prefix here - primary_icon_ and badge_icon_
should suffice (and make some methods fit on one line). E.g. see
splash_screen_url_

[F, 2017/02/02 22:30:42]

Done.

+  SkBitmap shortcut_badge_;
   ShortcutInfo shortcut_info_;
   GURL splash_screen_url_;
 
   base::CancelableTaskTracker favicon_task_tracker_;
   base::Timer data_timeout_timer_;
 
   const int ideal_icon_size_in_px_;
   const int minimum_icon_size_in_px_;
   const int ideal_splash_image_size_in_px_;
   const int minimum_splash_image_size_in_px_;
+  const int ideal_badge_size_in_px_;

[dominickn, 2017/02/02 19:16:50]

These appear to always be set to the same value. Can we just have one member?

A corollary is that it seems to me that we don't have this in-between zone for
badge icons: the minimal and ideal sizes are always the same. If that's the
case, why don't we just have one size parameter passed into InstallableManager
as well?

[F, 2017/02/02 21:05:51]

My understanding is that ShortcutHelper wraps the device-related information
while InstallableManager is more on the logic side. So I think
InstallableManager should allow setting a minimal value, though right now we
decide to provide the same value for both minimal and ideal.

This way, setting the values is AddToHomescreenManager's concern, and data
fetcher & InstallableManager provide a more generic interface.

WDUT?

[dominickn, 2017/02/02 21:17:11]

If we're going to provide the same value for now, we should just have one value.
Later on if we decide to have different values we can have the separate
variables (I doubt that we'll ever have a minimal badge icon size different from
the ideal).

I'm okay with you leaving InstallableManager alone, but in this class here I at
least think having one badge_size_in_px_ should suffice.

[F, 2017/02/02 22:30:42]

Done.

+  const int minimum_badge_size_in_px_;
 
   // Indicates whether to check WebAPK compatibility.
   bool check_webapk_compatibility_;
   bool is_waiting_for_web_application_info_;
   bool is_installable_check_complete_;
   bool is_icon_saved_;
   bool is_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(AddToHomescreenDataFetcher);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_