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

content/common/webkitplatformsupport_impl.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 "base/command_line.h"
 #include "content/common/child_thread.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/socket_stream_dispatcher.h"
 #include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 namespace content {
 
 WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() {
 }
 
 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() {
 }
 
 string16 WebKitPlatformSupportImpl::GetLocalizedString(int message_id) {
   return content::GetContentClient()->GetLocalizedString(message_id);
 }
 
 base::StringPiece WebKitPlatformSupportImpl::GetDataResource(
-    int resource_id) {
-  return content::GetContentClient()->GetDataResource(resource_id);
-}
-
-base::StringPiece WebKitPlatformSupportImpl::GetImageResource(
     int resource_id,
-    float scale_factor) {
-  return content::GetContentClient()->GetImageResource(resource_id,
-                                                       scale_factor);
+    ui::ScaleFactor scale_factor) {
+  return content::GetContentClient()->GetDataResource(resource_id,
+                                                      scale_factor);
 }
 
 void WebKitPlatformSupportImpl::GetPlugins(
     bool refresh, std::vector<webkit::WebPluginInfo>* plugins) {
   // This should not be called except in the renderer.
   // RendererWebKitPlatformSupportImpl overrides this.
   NOTREACHED();
 }
 
 webkit_glue::ResourceLoaderBridge*
@@ skipping 36 matching lines @@
     return context.release();
   }
 }
 
 GpuChannelHostFactory* WebKitPlatformSupportImpl::GetGpuChannelHostFactory() {
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace content