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

Unified Diff: chrome/browser/chromeos/drive/change_list_processor.cc

Issue 278273002: drive: Change the return type of ResourceMetadata's methods to FileError (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/drive/change_list_processor.cc
diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc
index 7cba1fd8ad42bb156c31808a243acc267acad8a7..fd469373c1fd18ad75f7592287aeb502f5402558 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor.cc
@@ -354,8 +354,7 @@ FileError ChangeListProcessor::ApplyEntry(const ResourceEntry& entry) {
new_entry.directory_specific_info().changestamp());
error = resource_metadata_->RefreshEntry(new_entry);
}
- DVLOG(1) << "Change was discarded for: "
- << resource_metadata_->GetFilePath(local_id).value();
+ DVLOG(1) << "Change was discarded for: " << entry.resource_id();
}
break;
case FILE_ERROR_NOT_FOUND: { // Adding a new entry.
@@ -458,7 +457,7 @@ void ChangeListProcessor::UpdateChangedDirs(const ResourceEntry& entry) {
base::FilePath file_path;
if (resource_metadata_->GetIdByResourceId(
entry.resource_id(), &local_id) == FILE_ERROR_OK)
- file_path = resource_metadata_->GetFilePath(local_id);
+ resource_metadata_->GetFilePath(local_id, &file_path);
if (!file_path.empty()) {
// Notify parent.

Powered by Google App Engine
This is Rietveld 408576698