Ensure that favicons always have 1x representation regardless of whether the platform supports it

chrome/browser/extensions/extension_install_prompt.cc

 // Copyright (c) 2012 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/extensions/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 86 matching lines @@
   // we need to update FetchOAuthIssueAdviceIfNeeded.
   0,
 };
 
 // Size of extension icon in top left of dialog.
 const int kIconSize = 69;
 
 // Returns pixel size under maximal scale factor for the icon whose device
 // independent size is |size_in_dip|
 int GetSizeForMaxScaleFactor(int size_in_dip) {
-  std::vector<ui::ScaleFactor> supported_scale_factors =
-      ui::GetSupportedScaleFactors();
-  // Scale factors are in ascending order, so the last one is the one we need.
-  ui::ScaleFactor max_scale_factor = supported_scale_factors.back();
-  float max_scale_factor_scale = ui::GetScaleFactorScale(max_scale_factor);
-
+  float max_scale_factor_scale =
+      ui::GetScaleFactorScale(ui::GetMaxScaleFactor());
   return static_cast<int>(size_in_dip * max_scale_factor_scale);
 }
 
 // Returns bitmap for the default icon with size equal to the default icon's
 // pixel size under maximal supported scale factor.
 SkBitmap GetDefaultIconBitmapForMaxScaleFactor(bool is_app) {
-  std::vector<ui::ScaleFactor> supported_scale_factors =
-      ui::GetSupportedScaleFactors();
-  // Scale factors are in ascending order, so the last one is the one we need.
-  ui::ScaleFactor max_scale_factor =
-      supported_scale_factors[supported_scale_factors.size() - 1];
-
   return Extension::GetDefaultIcon(is_app).
-      GetRepresentation(max_scale_factor).sk_bitmap();
+      GetRepresentation(ui::GetMaxScaleFactor()).sk_bitmap();
 }
 
 // If auto confirm is enabled then posts a task to proceed with or cancel the
 // install and returns true. Otherwise returns false.
 bool AutoConfirmPrompt(ExtensionInstallPrompt::Delegate* delegate) {
   const CommandLine* cmdline = CommandLine::ForCurrentProcess();
   if (!cmdline->HasSwitch(switches::kAppsGalleryInstallAutoConfirmForTests))
     return false;
   std::string value = cmdline->GetSwitchValueASCII(
       switches::kAppsGalleryInstallAutoConfirmForTests);
@@ skipping 497 matching lines @@
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_dialog_callback_.is_null()) {
     GetDefaultShowDialogCallback().Run(
         parent_web_contents_, delegate_, prompt_);
   } else {
     show_dialog_callback_.Run(parent_web_contents_, delegate_, prompt_);
   }
 }