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

ui/base/resource/resource_data_dll_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_data_dll_win.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/win/resource_util.h"
 
 namespace ui {
 
 ResourceDataDLL::ResourceDataDLL(HINSTANCE module) : module_(module) {
   DCHECK(module_);
 }
 
 ResourceDataDLL::~ResourceDataDLL() {
 }
 
+bool ResourceDataDLL::HasResource(uint16 resource_id) const {
+  void* data_ptr;
+  size_t data_size;
+  return base::win::GetDataResourceFromModule(module_,
+                                              resource_id,
+                                              &data_ptr,
+                                              &data_size);
+}
+
 bool ResourceDataDLL::GetStringPiece(uint16 resource_id,
                                      base::StringPiece* data) const {
   DCHECK(data);
   void* data_ptr;
   size_t data_size;
   if (base::win::GetDataResourceFromModule(module_,
                                            resource_id,
                                            &data_ptr,
                                            &data_size)) {
     data->set(static_cast<const char*>(data_ptr), data_size);
@@ skipping 11 matching lines @@
     return new base::RefCountedStaticMemory(
         reinterpret_cast<const unsigned char*>(data_ptr), data_size);
   }
   return NULL;
 }
 
 ResourceHandle::TextEncodingType ResourceDataDLL::GetTextEncodingType() const {
   return BINARY;
 }
 
-float ResourceDataDLL::GetScaleFactor() const {
-  return 1.0;
+ScaleFactor ResourceDataDLL::GetScaleFactor() const {
+  return ui::SCALE_FACTOR_NONE;
 }
 
 }  // namespace ui