diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 17:38:04 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 17:38:04 +0000 |
| commit | 5306d118a2880703b2e7d24d1267f7c3e67b376b (patch) | |
| tree | 984510292dc91259dad06882d659a36fb337127a /net/http/http_cache.cc | |
| parent | 42b8c0b39acc727cf56fe6e77dc9d62b6e15e25f (diff) | |
| download | chromium_src-5306d118a2880703b2e7d24d1267f7c3e67b376b.zip chromium_src-5306d118a2880703b2e7d24d1267f7c3e67b376b.tar.gz chromium_src-5306d118a2880703b2e7d24d1267f7c3e67b376b.tar.bz2 | |
Final patch to convert disk cache to using FilePath instead of
wstring. After this patch, I'm able to start chrome in a
user data dir with non-ascii characters on non-utf8 systems.
BUG=24444
Review URL: http://codereview.chromium.org/267085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_cache.cc')
| -rw-r--r-- | net/http/http_cache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index 7985992..86544c6 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -1670,8 +1670,9 @@ int HttpCache::CreateTransaction(scoped_ptr<HttpTransaction>* trans) { // was an in-memory cache. disk_cache_.reset(disk_cache::CreateInMemoryCacheBackend(cache_size_)); } else if (!disk_cache_dir_.empty()) { - disk_cache_.reset(disk_cache::CreateCacheBackend(disk_cache_dir_, true, - cache_size_, type_)); + disk_cache_.reset(disk_cache::CreateCacheBackend( + FilePath::FromWStringHack(disk_cache_dir_), true, cache_size_, + type_)); disk_cache_dir_.clear(); // Reclaim memory. } } |