Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: chrome/browser/chromeos/gdata/gdata_util.cc

Issue 10198003: gdata: Get rid of GetGDataCacheTmpDirectory() and friends (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix infinite recursion Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/gdata/gdata_util.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_util.cc b/chrome/browser/chromeos/gdata/gdata_util.cc
index c8d66a814583b327c75645a75cb344e7696f383c..2c6b4dd440bc4784a6b396cd67d02b67715cabf6 100644
--- a/chrome/browser/chromeos/gdata/gdata_util.cc
+++ b/chrome/browser/chromeos/gdata/gdata_util.cc
@@ -144,7 +144,8 @@ void ModifyGDataFileResourceUrl(Profile* profile,
// Handle hosted documents. The edit url is in the temporary file, so we
// read it on a blocking thread.
- if (file_system->GetGDataTempDocumentFolderPath().IsParent(
+ if (file_system->GetCacheDirectoryPath(
+ GDataRootDirectory::CACHE_TYPE_TMP_DOCUMENTS).IsParent(
gdata_cache_path)) {
GURL* edit_url = new GURL();
content::BrowserThread::GetBlockingPool()->PostTaskAndReply(FROM_HERE,
@@ -156,7 +157,8 @@ void ModifyGDataFileResourceUrl(Profile* profile,
}
// Handle all other gdata files.
- if (file_system->GetGDataCacheTmpDirectory().IsParent(gdata_cache_path)) {
+ if (file_system->GetCacheDirectoryPath(
+ GDataRootDirectory::CACHE_TYPE_TMP).IsParent(gdata_cache_path)) {
const std::string resource_id =
gdata_cache_path.BaseName().RemoveExtension().AsUTF8Unsafe();
GetFileNameDelegate delegate;

Powered by Google App Engine
This is Rietveld 408576698