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

ui/base/resource/resource_bundle.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.h"
 
 #include <vector>
 
 #include "base/big_endian.h"
 #include "base/command_line.h"
@@ skipping 335 matching lines @@
   }
 
   gfx::Image image;
   if (delegate_)
     image = delegate_->GetImageNamed(resource_id);
 
   if (image.IsEmpty()) {
     DCHECK(!data_packs_.empty()) <<
         "Missing call to SetResourcesDataDLL?";
 
-    float scale = PlatformGetImageScale();
+#if defined(OS_CHROMEOS)
+  ui::ScaleFactor scale_factor_to_load = GetMaxScaleFactor();
+#else
+  ui::ScaleFactor scale_factor_to_load = ui::SCALE_FACTOR_100P;
+#endif
+
+    float scale = PlatformGetImageScale(scale_factor_to_load);
 
     // TODO(oshima): Consider reading the image size from png IHDR chunk and
     // skip decoding here and remove #ifdef below.
     // ResourceBundle::GetSharedInstance() is destroyed after the
     // BrowserMainLoop has finished running. |image_skia| is guaranteed to be
     // destroyed before the resource bundle is destroyed.
     gfx::ImageSkia image_skia(new ResourceBundleImageSource(this, resource_id),
                               scale);
     if (image_skia.isNull()) {
       LOG(WARNING) << "Unable to load image with id " << resource_id;
@@ skipping 153 matching lines @@
 }
 
 ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
   return max_scale_factor_;
 #else
   return GetSupportedScaleFactors().back();
 #endif
 }
 
+#if !defined(OS_WIN)
+// static
+float ResourceBundle::PlatformGetImageScale(
+    ui::ScaleFactor scale_factor) {
+  return GetImageScale(scale_factor);
+}
+#endif
+
 ResourceBundle::ResourceBundle(Delegate* delegate)
     : delegate_(delegate),
       images_and_fonts_lock_(new base::Lock),
       locale_resources_data_lock_(new base::Lock),
       max_scale_factor_(SCALE_FACTOR_100P) {
 }
 
 ResourceBundle::~ResourceBundle() {
   FreeImages();
   UnloadLocaleResources();
@@ skipping 276 matching lines @@
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 #if !defined(OS_WIN)
 // static
 SkBitmap ResourceBundle::PlatformScaleImage(const SkBitmap& image,
                                             float loaded_image_scale,
                                             float desired_scale) {
   return image;
 }
-
-float ResourceBundle::PlatformGetImageScale() {
-#if defined(OS_CHROMEOS)
-  ui::ScaleFactor scale_factor_to_load = GetMaxScaleFactor();
-#else
-  ui::ScaleFactor scale_factor_to_load = ui::SCALE_FACTOR_100P;
-#endif
-  return GetImageScale(scale_factor_to_load);
-}
 #endif
 
 }  // namespace ui