Index: content/renderer/renderer_webkitplatformsupport_impl.cc |
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc |
index 32a708655c01c73b0daf9f4ae3a617b0d896f12e..dc5b11bcbe01bf126d2a7a4c44a570b10f897f8c 100644 |
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc |
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc |
@@ -4,6 +4,9 @@ |
#include "content/renderer/renderer_webkitplatformsupport_impl.h" |
+#include <algorithm> |
+#include <vector> |
Chris Rogers
2012/06/25 20:05:17
Not sure if this or the other changes in this file
henrika (OOO until Aug 14)
2012/06/26 11:17:27
I removed this file from the CL.
|
+ |
#include "base/command_line.h" |
#include "base/file_path.h" |
#include "base/file_util.h" |
@@ -343,7 +346,8 @@ WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() { |
return web_idb_factory_.get(); |
} |
-void RendererWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath( |
+void |
+RendererWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath( |
const WebVector<WebSerializedScriptValue>& values, |
const WebIDBKeyPath& keyPath, |
WebVector<WebIDBKey>& keys_out) { |
@@ -389,7 +393,6 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeForExtension( |
new MimeRegistryMsg_GetMimeTypeFromExtension( |
webkit_glue::WebStringToFilePathString(file_extension), &mime_type)); |
return ASCIIToUTF16(mime_type); |
- |
} |
WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile( |
@@ -404,7 +407,6 @@ WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile( |
FilePath(webkit_glue::WebStringToFilePathString(file_path)), |
&mime_type)); |
return ASCIIToUTF16(mime_type); |
- |
} |
WebString |
@@ -676,7 +678,7 @@ void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) { |
WebKit::WebString RendererWebKitPlatformSupportImpl::userAgent( |
const WebKit::WebURL& url) { |
- return WebKitPlatformSupportImpl::userAgent(url); |
+ return WebKitPlatformSupportImpl::userAgent(url); |
} |
void RendererWebKitPlatformSupportImpl::GetPlugins( |