diff options
Diffstat (limited to 'webkit/support/webkit_support.cc')
| -rw-r--r-- | webkit/support/webkit_support.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 214c417..4d97c56 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -45,8 +45,8 @@ #include "ui/gfx/gl/gl_surface.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/media/video_renderer_impl.h" -#include "webkit/glue/webkit_constants.h" #include "webkit/glue/user_agent.h" +#include "webkit/glue/webkit_constants.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/glue/webmediaplayer_impl.h" @@ -56,8 +56,8 @@ #include "webkit/plugins/webplugininfo.h" #include "webkit/support/platform_support.h" #include "webkit/support/simple_database_system.h" -#include "webkit/support/test_webplugin_page_delegate.h" #include "webkit/support/test_webkit_platform_support.h" +#include "webkit/support/test_webplugin_page_delegate.h" #include "webkit/tools/test_shell/simple_file_system.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" @@ -541,7 +541,7 @@ int64 GetCurrentTimeInMillisecond() { } std::string EscapePath(const std::string& path) { - return ::EscapePath(path); + return net::EscapePath(path); } std::string MakeURLErrorDescription(const WebKit::WebURLError& error) { |