Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

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/utf_string_conversions.h"
 #include "ui/base/layout.h"
@@ skipping 31 matching lines @@
   bool use_hidpi = false;
 #if defined(ENABLE_HIDPI)
   // If we're running in HiDPI mode at a scale larger than 150%, we switch
   // to 2x resources for desktop layouts.
   use_hidpi = ui::GetDPIScale() > 1.5;
 #endif
 
   switch (ui::GetDisplayLayout()) {
     case ui::LAYOUT_TOUCH:
       AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
-                  ResourceHandle::kScaleFactor100x);
+                  SCALE_FACTOR_100P);
       AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
-                  ResourceHandle::kScaleFactor100x);
+                  SCALE_FACTOR_100P);
       break;
     default:
       if (use_hidpi) {
         AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
-                    ResourceHandle::kScaleFactor200x);
+                    SCALE_FACTOR_200P);
         AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
-                    ResourceHandle::kScaleFactor200x);
+                    SCALE_FACTOR_200P);
       } else {
         AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
-                    ResourceHandle::kScaleFactor100x);
+                    SCALE_FACTOR_100P);
         AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
-                    ResourceHandle::kScaleFactor100x);
+                    SCALE_FACTOR_100P);
       }
       break;
   }
 }
 
 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);
 }
 
 void SetResourcesDataDLL(HINSTANCE handle) {
   resources_data_dll = handle;
 }
 
 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
   return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
 }
 
 }  // namespace ui;