Ensure that extension resources are loaded with the correct scaling applied on Windows.

ui/base/resource/resource_bundle_win.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 "ui/base/resource/resource_bundle_win.h"
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "skia/ext/image_operations.h"
@@ skipping 48 matching lines @@
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped image is not used on Windows.
   DCHECK_EQ(rtl, RTL_DISABLED);
 
   // Windows only uses SkBitmap for gfx::Image, so this is the same as
   // GetImageNamed.
   return GetImageNamed(resource_id);
 }
 
 // static
+float ResourceBundle::PlatformGetImageScale(ui::ScaleFactor scale_factor) {
+  if (!gfx::IsHighDPIEnabled())
+    return ui::GetImageScale(scale_factor);
+  return gfx::win::GetDeviceScaleFactor();
+}
+
+// static
 SkBitmap ResourceBundle::PlatformScaleImage(const SkBitmap& image,
                                             float loaded_image_scale,
                                             float desired_bitmap_scale) {
   if (!gfx::IsHighDPIEnabled())
     return image;
 
   // On Windows we can have multiple device scales like 1/1.25/1.5/2, etc.
   // We only have 1x and 2x data packs. We need to scale the bitmaps
   // accordingly.
   if (loaded_image_scale == desired_bitmap_scale)
     return image;
 
   SkBitmap scaled_image;
   gfx::Size unscaled_size(image.width(), image.height());
   gfx::Size scaled_size = ToCeiledSize(
       gfx::ScaleSize(unscaled_size,
                       desired_bitmap_scale / loaded_image_scale));
   scaled_image = skia::ImageOperations::Resize(
       image,
       skia::ImageOperations::RESIZE_LANCZOS3,
       scaled_size.width(),
       scaled_size.height());
   DCHECK_EQ(scaled_image.width(), scaled_size.width());
   DCHECK_EQ(scaled_image.height(), scaled_size.height());
   return scaled_image;
 }
 
-float ResourceBundle::PlatformGetImageScale() {
-  if (!gfx::IsHighDPIEnabled())
-    return ui::GetImageScale(GetMaxScaleFactor());
-  return gfx::win::GetDeviceScaleFactor();
-}
-
 void SetResourcesDataDLL(HINSTANCE handle) {
   resources_data_dll = handle;
 }
 
 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
   return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
 }
 
 }  // namespace ui;