3 files changed, 13 insertions, 12 deletions
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index 90b7fe9..679fddf 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -31,7 +31,6 @@ extern "C" {
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "grit/content_resources.h"
-#include "ui/base/layout.h"
 #include "ui/gl/gl_surface.h"
 #include "unicode/uchar.h"
 
@@ -364,8 +363,7 @@ NSString* LoadSandboxTemplate(int sandbox_type) {
   }
 
   base::StringPiece sandbox_definition =
-      content::GetContentClient()->GetDataResource(
-          sandbox_profile_resource_id, ui::SCALE_FACTOR_NONE);
+      content::GetContentClient()->GetDataResource(sandbox_profile_resource_id);
   if (sandbox_definition.empty()) {
     LOG(FATAL) << "Failed to load the sandbox profile (resource id "
                << sandbox_profile_resource_id << ")";
@@ -373,8 +371,7 @@ NSString* LoadSandboxTemplate(int sandbox_type) {
   }
 
   base::StringPiece common_sandbox_definition =
-      content::GetContentClient()->GetDataResource(
-          IDR_COMMON_SANDBOX_PROFILE, ui::SCALE_FACTOR_NONE);
+      content::GetContentClient()->GetDataResource(IDR_COMMON_SANDBOX_PROFILE);
   if (common_sandbox_definition.empty()) {
     LOG(FATAL) << "Failed to load the common sandbox profile";
     return nil;
diff --git a/content/common/webkitplatformsupport_impl.cc b/content/common/webkitplatformsupport_impl.cc
index 0fc1f2b..6309d9c 100644
--- a/content/common/webkitplatformsupport_impl.cc
+++ b/content/common/webkitplatformsupport_impl.cc
@@ -24,10 +24,15 @@ string16 WebKitPlatformSupportImpl::GetLocalizedString(int message_id) {
 }
 
 base::StringPiece WebKitPlatformSupportImpl::GetDataResource(
+    int resource_id) {
+  return content::GetContentClient()->GetDataResource(resource_id);
+}
+
+base::StringPiece WebKitPlatformSupportImpl::GetImageResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) {
-  return content::GetContentClient()->GetDataResource(resource_id,
-                                                      scale_factor);
+    float scale_factor) {
+  return content::GetContentClient()->GetImageResource(resource_id,
+                                                       scale_factor);
 }
 
 void WebKitPlatformSupportImpl::GetPlugins(
diff --git a/content/common/webkitplatformsupport_impl.h b/content/common/webkitplatformsupport_impl.h
index 8d1e2f5..c190ae6 100644
--- a/content/common/webkitplatformsupport_impl.h
+++ b/content/common/webkitplatformsupport_impl.h
@@ -8,7 +8,6 @@
 
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
-#include "ui/base/layout.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 
 class GpuChannelHostFactory;
@@ -24,9 +23,9 @@ class CONTENT_EXPORT WebKitPlatformSupportImpl
   virtual ~WebKitPlatformSupportImpl();
 
   virtual string16 GetLocalizedString(int message_id) OVERRIDE;
-  virtual base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) OVERRIDE;
+  virtual base::StringPiece GetDataResource(int resource_id) OVERRIDE;
+  virtual base::StringPiece GetImageResource(int resource_id,
+                                             float scale_factor) OVERRIDE;
   virtual void GetPlugins(bool refresh,
                           std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
   virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(