Make minimum PWA icon size the same accross all device densities

chrome/browser/installable/installable_manager.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_INSTALLABLE_INSTALLABLE_MANAGER_H_
 #define CHROME_BROWSER_INSTALLABLE_INSTALLABLE_MANAGER_H_
 
 #include <map>
 #include <memory>
-#include <tuple>
 #include <utility>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/installable/installable_logging.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "content/public/common/manifest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
 // This struct specifies the work to be done by the InstallableManager.
 // Data is cached and fetched in the order specified in this struct. A web app
 // manifest will always be fetched first.
 struct InstallableParams {
   // The ideal primary icon size to fetch. Used only if
   // |fetch_valid_primary_icon| is true.
   int ideal_primary_icon_size_in_px = -1;
 
-  // The minimum primary icon size to fetch. Used only if
-  // |fetch_valid_primary_icon| is true.
-  int minimum_primary_icon_size_in_px = -1;
-
   // The ideal badge icon size to fetch. Used only if
   // |fetch_valid_badge_icon| is true.
   int ideal_badge_icon_size_in_px = -1;
 
-  // The minimum badge icon size to fetch. Used only if
-  // |fetch_valid_badge_icon| is true.
-  int minimum_badge_icon_size_in_px = -1;
-
   // Check whether the site is installable. That is, it has a manifest valid for
   // a web app and a service worker controlling the manifest start URL and the
   // current URL.
   bool check_installable = false;
 
   // Check whether there is a fetchable, non-empty icon in the manifest
   // conforming to the primary icon size parameters.
   bool fetch_valid_primary_icon = false;
 
   // Check whether there is a fetchable, non-empty icon in the manifest
@@ skipping 72 matching lines @@
   virtual void GetData(const InstallableParams& params,
                        const InstallableCallback& callback);
 
  private:
   friend class InstallableManagerUnitTest;
   FRIEND_TEST_ALL_PREFIXES(InstallableManagerBrowserTest,
                            ManagerBeginsInEmptyState);
   FRIEND_TEST_ALL_PREFIXES(InstallableManagerBrowserTest, CheckWebapp);
 
   using Task = std::pair<InstallableParams, InstallableCallback>;
-  using IconParams = std::tuple<int, int, content::Manifest::Icon::IconPurpose>;
+  using IconParams = std::pair<int, content::Manifest::Icon::IconPurpose>;
 
   struct ManifestProperty;
   struct InstallableProperty;
   struct IconProperty;
 
   // Returns an IconParams object that queries for a primary icon conforming to
   // the primary icon size parameters in |params|.
   IconParams ParamsForPrimaryIcon(const InstallableParams& params) const;
   // Returns an IconParams object that queries for a badge icon conforming to
   // the badge icon size parameters in |params|.
@@ skipping 70 matching lines @@
   std::map<IconParams, IconProperty> icons_;
 
   bool is_active_;
 
   base::WeakPtrFactory<InstallableManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InstallableManager);
 };
 
 #endif  // CHROME_BROWSER_INSTALLABLE_INSTALLABLE_MANAGER_H_