Rename "icon" to "primary icon" in InstallableManager

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 <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/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 icon size to fetch. Used only if |fetch_valid_icon| is true.
-  int ideal_icon_size_in_px = -1;
+  // 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 icon size to fetch. Used only if |fetch_valid_icon| is true.
-  int minimum_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;
 
   // 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 an icon in the manifest conforming to the icon size
-  // parameters, and that the icon can be fetched and isn't an empty bitmap.
-  bool fetch_valid_icon = false;
+  // Check whether there is a primary icon in the manifest conforming to the

[dominickn, 2017/01/16 02:10:06]

Nit: we're not checking for a primary icon in the manifest. We're checking for
any icon in the manifest that conforms to the primary size, and we'll use that
as the primary. So this comment should read:

Check whether there is a fetchable, non-empty icon in the manifest conforming to
the primary icon size parameters.

[F, 2017/01/16 14:37:52]

Done. Thanks!

+  // primary icon size parameters, and that the primary icon can be fetched and
+  // isn't an empty bitmap.
+  bool fetch_valid_primary_icon = false;
 };
 
 // This struct is passed to an InstallableCallback when the InstallableManager
 // has finished working. Each reference is owned by InstallableManager, and
 // callers should copy any objects which they wish to use later. Non-requested
 // fields will be set to null, empty, or false.
 struct InstallableData {
   // NO_ERROR_DETECTED if there were no issues.
   const InstallableStatusCode error_code;
 
   // Empty if the site has no <link rel="manifest"> tag.
   const GURL& manifest_url;
 
   // Empty if the site has an unparseable manifest.
   const content::Manifest& manifest;
 
-  // Empty if no icon was requested.
-  const GURL& icon_url;
+  // Empty if no primary_icon was requested.
+  const GURL& primary_icon_url;
 
-  // nullptr if the most appropriate icon couldn't be determined or downloaded.
-  // The underlying icon is owned by the InstallableManager; clients must copy
-  // the bitmap if they want to to use it. If fetch_valid_icon was true and an
-  // icon could not be retrieved, the reason will be in error_code.
-  const SkBitmap* icon;
+  // nullptr if the most appropriate primary icon couldn't be determined or
+  // downloaded. The underlying primary icon is owned by the InstallableManager;
+  // clients must copy the bitmap if they want to to use it. If
+  // fetch_valid_primary_icon was true and a primary icon could not be
+  // retrieved, the reason will be in error_code.
+  const SkBitmap* primary_icon;
 
   // true if the site has a service worker and a viable web app manifest. If
   // check_installable was true and the site isn't installable, the reason will
   // be in error_code.
   const bool is_installable;
 };
 
 using InstallableCallback = base::Callback<void(const InstallableData&)>;
 
 // This class is responsible for fetching the resources required to check and
@@ skipping 106 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_