Rename "icon" to "primary icon" in InstallableManager

chrome/browser/banners/app_banner_manager.cc

 // 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.
 
 #include "chrome/browser/banners/app_banner_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 24 matching lines @@
 
 InstallableParams ParamsToGetManifest() {
   return InstallableParams();
 }
 
 // Returns an InstallableParams object that requests all checks necessary for
 // a web app banner.
 InstallableParams ParamsToPerformInstallableCheck(int ideal_icon_size_in_px,
                                                   int minimum_icon_size_in_px) {
   InstallableParams params;
-  params.ideal_icon_size_in_px = ideal_icon_size_in_px;
-  params.minimum_icon_size_in_px = minimum_icon_size_in_px;
+  params.ideal_primary_icon_size_in_px = ideal_icon_size_in_px;
+  params.minimum_primary_icon_size_in_px = minimum_icon_size_in_px;
   params.check_installable = true;
-  params.fetch_valid_icon = true;
+  params.fetch_valid_primary_icon = true;
 
   return params;
 }
 
 }  // anonymous namespace
 
 namespace banners {
 
 // static
 base::Time AppBannerManager::GetCurrentTime() {
@@ skipping 208 matching lines @@
       TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER);
 
     ReportStatus(web_contents(), data.error_code);
     Stop();
   }
 
   if (!is_active_)
     return;
 
   DCHECK(data.is_installable);
-  DCHECK(!data.icon_url.is_empty());
-  DCHECK(data.icon);
+  DCHECK(!data.primary_icon_url.is_empty());
+  DCHECK(data.primary_icon);
 
-  icon_url_ = data.icon_url;
-  icon_.reset(new SkBitmap(*data.icon));
+  icon_url_ = data.primary_icon_url;
+  icon_.reset(new SkBitmap(*data.primary_icon));
 
   SendBannerPromptRequest();
 }
 
 void AppBannerManager::RecordDidShowBanner(const std::string& event_name) {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
   AppBannerSettingsHelper::RecordBannerEvent(
       contents, validated_url_, GetAppIdentifier(),
@@ skipping 244 matching lines @@
     // Simulate a non-canceled OnBannerPromptReply to show the delayed banner.
     // Don't reset |was_canceled_by_page_| yet for metrics purposes.
     OnBannerPromptReply(blink::mojom::AppBannerPromptReply::NONE, referrer_);
   } else {
     // Log that the prompt request was made for when we get the prompt reply.
     page_requested_prompt_ = true;
   }
 }
 
 }  // namespace banners