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

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

Issue 10854083: Remove parent* arg from GDataEntry ctor. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/gdata/gdata_files.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gdata/gdata_file_system.cc
===================================================================
--- chrome/browser/chromeos/gdata/gdata_file_system.cc (revision 151007)
+++ chrome/browser/chromeos/gdata/gdata_file_system.cc (working copy)
@@ -1745,9 +1745,7 @@
if (error == GDATA_FILE_OK) {
scoped_ptr<DocumentEntry> doc_entry(DocumentEntry::ExtractAndParse(*data));
if (doc_entry.get()) {
- fresh_entry.reset(
- GDataEntry::FromDocumentEntry(NULL, doc_entry.get(),
- directory_service_.get()));
+ fresh_entry.reset(directory_service_->FromDocumentEntry(doc_entry.get()));
}
if (!fresh_entry.get() || !fresh_entry->AsGDataFile()) {
LOG(ERROR) << "Got invalid entry from server for " << params.resource_id;
@@ -2340,8 +2338,7 @@
// result directory.
for (size_t i = 0; i < feed->entries().size(); ++i) {
DocumentEntry* doc = const_cast<DocumentEntry*>(feed->entries()[i]);
- scoped_ptr<GDataEntry> entry(
- GDataEntry::FromDocumentEntry(NULL, doc, directory_service_.get()));
+ scoped_ptr<GDataEntry> entry(directory_service_->FromDocumentEntry(doc));
if (!entry.get())
continue;
@@ -2480,8 +2477,7 @@
return;
}
- GDataEntry* entry = GDataEntry::FromDocumentEntry(
- NULL, doc_entry.get(), directory_service_.get());
+ GDataEntry* entry = directory_service_->FromDocumentEntry(doc_entry.get());
if (!entry) {
callback.Run(GDATA_FILE_ERROR_FAILED);
return;
@@ -2827,8 +2823,8 @@
if (!parent_dir)
return GDATA_FILE_ERROR_FAILED;
- GDataEntry* new_entry = GDataEntry::FromDocumentEntry(
- NULL, doc_entry.get(), directory_service_.get());
+ GDataEntry* new_entry =
+ directory_service_->FromDocumentEntry(doc_entry.get());
if (!new_entry)
return GDATA_FILE_ERROR_FAILED;
@@ -2950,8 +2946,7 @@
return;
scoped_ptr<GDataEntry> new_entry(
- GDataEntry::FromDocumentEntry(
- NULL, entry.get(), directory_service_.get()));
+ directory_service_->FromDocumentEntry(entry.get()));
if (!new_entry.get())
return;
« no previous file with comments | « no previous file | chrome/browser/chromeos/gdata/gdata_files.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698