diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 21:02:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 21:02:31 +0000 |
| commit | 30426c385b563f5014e81110b1f0d98c58100847 (patch) | |
| tree | 274fb3dc5bad45f430b76b72e007f21edd600f9a /webkit/support | |
| parent | f09d55d9bcd61359dc0fafcad4158d9946cd674e (diff) | |
| download | chromium_src-30426c385b563f5014e81110b1f0d98c58100847.zip chromium_src-30426c385b563f5014e81110b1f0d98c58100847.tar.gz chromium_src-30426c385b563f5014e81110b1f0d98c58100847.tar.bz2 | |
net: Move the last two Escape() functions into the net namespace.
BUG=64263
TEST=None
R=willchan@chromium.org
Review URL: http://codereview.chromium.org/8507011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109298 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -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) { |