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

ui/base/resource/resource_bundle_aurax11.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 "base/logging.h"
 #include "base/path_service.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_handle.h"
@@ skipping 17 matching lines @@
 
 void ResourceBundle::LoadCommonResources() {
   // Always load the 1x data pack first as the 2x data pack contains both 1x and
   // 2x images. The 1x data pack only has 1x images, thus passes in an accurate
   // scale factor to gfx::ImageSkia::AddBitmapForScale.
   // TODO(pkotwicz): Fix this in cases where it is intended for the 2x bitmap
   // not to be 2 * size of the 1x bitmap for HDA.
   // TODO(oshima): Fix this where it is unintended.
 
   AddDataPack(GetResourcesPakFilePath("chrome.pak"),
-              ResourceHandle::kScaleFactor100x);
+              SCALE_FACTOR_100P);
 
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
     AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
   } else {
     AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
     AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
-                ResourceHandle::kScaleFactor100x);
+                SCALE_FACTOR_100P);
     AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
-                ResourceHandle::kScaleFactor200x);
+                SCALE_FACTOR_200P);
   }
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped image is not used on ChromeOS.
   DCHECK_EQ(rtl, RTL_DISABLED);
   return GetImageNamed(resource_id);
 }
 
 }  // namespace ui