Rename "icon" to "primary icon" in InstallableManager

chrome/browser/installable/installable_manager.cc

 // 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.
 
 #include "chrome/browser/installable/installable_manager.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
@@ skipping 97 matching lines @@
   tasks_.push_back({params, callback});
   if (is_active_)
     return;
 
   is_active_ = true;
   StartNextTask();
 }
 
 InstallableManager::IconProperty& InstallableManager::GetIcon(
     const InstallableParams& params) {
-  return icons_[{params.ideal_icon_size_in_px, params.minimum_icon_size_in_px}];
+  return icons_[{params.ideal_primary_icon_size_in_px,
+                 params.minimum_primary_icon_size_in_px}];
 }
 
 bool InstallableManager::IsIconFetched(const InstallableParams& params) const {
-  const auto it = icons_.find(
-      {params.ideal_icon_size_in_px, params.minimum_icon_size_in_px});
+  const auto it = icons_.find({params.ideal_primary_icon_size_in_px,
+                               params.minimum_primary_icon_size_in_px});
   return it != icons_.end() && it->second.fetched;
 }
 
 void InstallableManager::SetIconFetched(const InstallableParams& params) {
   GetIcon(params).fetched = true;
 }
 
 InstallableStatusCode InstallableManager::GetErrorCode(
     const InstallableParams& params) {
   if (manifest_->error != NO_ERROR_DETECTED)
     return manifest_->error;
 
   if (params.check_installable && installable_->error != NO_ERROR_DETECTED)
     return installable_->error;
 
-  if (params.fetch_valid_icon) {
+  if (params.fetch_valid_primary_icon) {
     IconProperty& icon = GetIcon(params);
     if (icon.error != NO_ERROR_DETECTED)
       return icon.error;
   }
 
   return NO_ERROR_DETECTED;
 }
 
 InstallableStatusCode InstallableManager::manifest_error() const {
   return manifest_->error;
@@ skipping 29 matching lines @@
     return nullptr;
   return contents;
 }
 
 bool InstallableManager::IsComplete(const InstallableParams& params) const {
   // Returns true if for all resources:
   //  a. the params did not request it, OR
   //  b. the resource has been fetched/checked.
   return manifest_->fetched &&
          (!params.check_installable || installable_->fetched) &&
-         (!params.fetch_valid_icon || IsIconFetched(params));
+         (!params.fetch_valid_primary_icon || IsIconFetched(params));
 }
 
 void InstallableManager::Reset() {
   // Prevent any outstanding callbacks to or from this object from being called.
   weak_factory_.InvalidateWeakPtrs();
   tasks_.clear();
   icons_.clear();
 
   manifest_.reset(new ManifestProperty());
   installable_.reset(new InstallableProperty());
@@ skipping 10 matching lines @@
 }
 
 void InstallableManager::RunCallback(const Task& task,
                                      InstallableStatusCode code) {
   const InstallableParams& params = task.first;
   IconProperty& icon = GetIcon(params);
   InstallableData data = {
       code,
       manifest_url(),
       manifest(),
-      params.fetch_valid_icon ? icon.url : GURL::EmptyGURL(),
-      params.fetch_valid_icon ? icon.icon.get() : nullptr,
+      params.fetch_valid_primary_icon ? icon.url : GURL::EmptyGURL(),
+      params.fetch_valid_primary_icon ? icon.icon.get() : nullptr,
       params.check_installable ? is_installable() : false};
 
   task.second.Run(data);
 }
 
 void InstallableManager::StartNextTask() {
   // If there's nothing to do, exit. Resources remain cached so any future calls
   // won't re-fetch anything that has already been retrieved.
   if (tasks_.empty()) {
     is_active_ = false;
@@ skipping 14 matching lines @@
     RunCallback(task, code);
     tasks_.erase(tasks_.begin());
     StartNextTask();
     return;
   }
 
   if (!manifest_->fetched)
     FetchManifest();
   else if (params.check_installable && !installable_->fetched)
     CheckInstallable();
-  else if (params.fetch_valid_icon && !IsIconFetched(params))
+  else if (params.fetch_valid_primary_icon && !IsIconFetched(params))
     CheckAndFetchBestIcon();
   else
     NOTREACHED();
 }
 
 void InstallableManager::FetchManifest() {
   DCHECK(!manifest_->fetched);
 
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
@@ skipping 107 matching lines @@
 
 void InstallableManager::CheckAndFetchBestIcon() {
   DCHECK(!manifest().IsEmpty());
   DCHECK(!tasks_.empty());
 
   const InstallableParams& params = tasks_[0].first;
   IconProperty& icon = GetIcon(params);
   icon.fetched = true;
 
   GURL icon_url = ManifestIconSelector::FindBestMatchingIcon(
-      manifest().icons, params.ideal_icon_size_in_px,
-      params.minimum_icon_size_in_px);
+      manifest().icons, params.ideal_primary_icon_size_in_px,
+      params.minimum_primary_icon_size_in_px);
 
   if (icon_url.is_empty()) {
     icon.error = NO_ACCEPTABLE_ICON;
   } else {
     bool can_download_icon = ManifestIconDownloader::Download(
-        GetWebContents(), icon_url, params.ideal_icon_size_in_px,
-        params.minimum_icon_size_in_px,
+        GetWebContents(), icon_url, params.ideal_primary_icon_size_in_px,
+        params.minimum_primary_icon_size_in_px,
         base::Bind(&InstallableManager::OnAppIconFetched,
                    weak_factory_.GetWeakPtr(), icon_url));
     if (can_download_icon)
       return;
     icon.error = CANNOT_DOWNLOAD_ICON;
   }
 
   WorkOnTask();
 }
 
@@ skipping 33 matching lines @@
   return manifest_->url;
 }
 
 const content::Manifest& InstallableManager::manifest() const {
   return manifest_->manifest;
 }
 
 bool InstallableManager::is_installable() const {
   return installable_->installable;
 }