diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 10:17:12 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 10:17:12 +0000 |
| commit | 72cbd32707a2ede460bcc1b3cb199e653282a8ed (patch) | |
| tree | d212d36fbd064fd4b8c5783a9002f235c98d7a2d /chrome/common | |
| parent | 2fe25aac3d317086338a761e3b040cbcffc3a873 (diff) | |
| download | chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.zip chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.tar.gz chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.tar.bz2 | |
Switching things to FilePath:
Remove following deprecated wstring-using functions:
net/net_util: FilePathToFileURL
net/net_util: FileURLToFilePath
Switch net/base/upload_data to FilePath.
Switch upload-related parts of net/url_request/url_request to FilePath.
Made necessary adjustments in rest of code (a lot).
Review URL: http://codereview.chromium.org/63011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/render_messages.h | 2 | ||||
| -rw-r--r-- | chrome/common/render_messages_internal.h | 1 | ||||
| -rw-r--r-- | chrome/common/resource_dispatcher.cc | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 1c983d0..0d5404a 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -1105,7 +1105,7 @@ struct ParamTraits<net::UploadData::Element> { r->SetToBytes(data, len); } else { DCHECK(type == net::UploadData::TYPE_FILE); - std::wstring file_path; + FilePath file_path; uint64 offset, length; if (!ReadParam(m, iter, &file_path)) return false; diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 4b36a35..a39dca8 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -12,6 +12,7 @@ #include "build/build_config.h" #include "base/clipboard.h" +#include "base/file_path.h" #include "base/gfx/rect.h" #include "base/gfx/native_widget_types.h" #include "base/shared_memory.h" diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc index 08ace17..c507510 100644 --- a/chrome/common/resource_dispatcher.cc +++ b/chrome/common/resource_dispatcher.cc @@ -8,6 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/file_path.h" #include "base/message_loop.h" #include "base/shared_memory.h" #include "base/string_util.h" @@ -60,7 +61,7 @@ class IPCResourceLoaderBridge : public ResourceLoaderBridge { // ResourceLoaderBridge virtual void AppendDataToUpload(const char* data, int data_len); - virtual void AppendFileRangeToUpload(const std::wstring& path, + virtual void AppendFileRangeToUpload(const FilePath& path, uint64 offset, uint64 length); virtual void SetUploadIdentifier(int64 identifier); virtual bool Start(Peer* peer); @@ -157,7 +158,7 @@ void IPCResourceLoaderBridge::AppendDataToUpload(const char* data, } void IPCResourceLoaderBridge::AppendFileRangeToUpload( - const std::wstring& path, uint64 offset, uint64 length) { + const FilePath& path, uint64 offset, uint64 length) { DCHECK(request_id_ == -1) << "request already started"; if (!request_.upload_data) |