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

chrome/browser/extensions/extension_uninstall_dialog.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_uninstall_dialog.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // 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();
+  ui::ScaleFactor max_scale_factor = ui::GetMaxScaleFactor();
   float max_scale_factor_scale = ui::GetScaleFactorScale(max_scale_factor);
 
   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 extensions::Extension::GetDefaultIcon(is_app).
-      GetRepresentation(max_scale_factor).sk_bitmap();
+      GetRepresentation(ui::GetMaxScaleFactor()).sk_bitmap();
 }
 
 }  // namespace
 
 // Size of extension icon in top left of dialog.
 static const int kIconSize = 69;
 
 ExtensionUninstallDialog::ExtensionUninstallDialog(
     Browser* browser,
     ExtensionUninstallDialog::Delegate* delegate)
@@ skipping 62 matching lines @@
   DCHECK(type == chrome::NOTIFICATION_BROWSER_CLOSING);
 
   browser_ = NULL;
   if (tracker_.get()) {
     // If we're waiting for the icon, stop doing so because we're not going to
     // show the dialog.
     tracker_.reset();
     delegate_->ExtensionUninstallCanceled();
   }
 }