Index: webkit/tools/test_shell/test_shell_webkit_init.h |
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h |
index 09f696ddcd38ffc22e5a2630453e408aaa1dd53e..7f0eb930b787ed69458a50c70d89579e6bb376ed 100644 |
--- a/webkit/tools/test_shell/test_shell_webkit_init.h |
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h |
@@ -10,8 +10,8 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" |
#include "webkit/glue/webclipboard_impl.h" |
#include "webkit/glue/webfileutilities_impl.h" |
#include "webkit/glue/webkit_glue.h" |
@@ -105,9 +105,9 @@ class TestShellWebKitInit : public webkit_glue::WebKitPlatformSupportImpl { |
const WebKit::WebGraphicsContext3D::Attributes& attributes); |
virtual string16 GetLocalizedString(int message_id) OVERRIDE; |
- virtual base::StringPiece GetDataResource(int resource_id) OVERRIDE; |
- virtual base::StringPiece GetImageResource(int resource_id, |
- float scale_factor) OVERRIDE; |
+ virtual base::StringPiece GetDataResource( |
+ int resource_id, |
+ ui::ScaleFactor scale_factor) OVERRIDE; |
virtual void GetPlugins(bool refresh, |
std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; |
virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader( |