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

Unified Diff: components/drive/resource_entry_conversion.cc

Issue 2799603002: Process TeamDrive change in change list. (Closed)
Patch Set: Remove unnecessary return value, as the TeamDriveResource conversion always succeeds. Created 3 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: components/drive/resource_entry_conversion.cc
diff --git a/components/drive/resource_entry_conversion.cc b/components/drive/resource_entry_conversion.cc
index 52eda29bffc8b0f0c4a9c826d707920a90129d48..7b719f81a4c9fb0a55e66611ecf812d0068df196 100644
--- a/components/drive/resource_entry_conversion.cc
+++ b/components/drive/resource_entry_conversion.cc
@@ -26,12 +26,18 @@ bool ConvertChangeResourceToResourceEntry(
ResourceEntry converted;
std::string parent_resource_id;
- if (input.file() &&
- !ConvertFileResourceToResourceEntry(*input.file(), &converted,
- &parent_resource_id))
+ if (input.type() == google_apis::ChangeResource::TEAM_DRIVE) {
+ converted.mutable_file_info()->set_is_directory(true);
+ converted.set_parent_local_id(util::kDriveTeamDrivesDirLocalId);
+ if (input.team_drive())
+ ConvertTeamDriveResourceToResourceEntry(*input.team_drive(), &converted);
+ converted.set_resource_id(input.team_drive_id());
+ } else {
+ if (input.file() && !ConvertFileResourceToResourceEntry(
+ *input.file(), &converted, &parent_resource_id))
return false;
-
- converted.set_resource_id(input.file_id());
+ converted.set_resource_id(input.file_id());
+ }
converted.set_deleted(converted.deleted() || input.is_deleted());
converted.set_modification_date(input.modification_date().ToInternalValue());
@@ -128,6 +134,14 @@ bool ConvertFileResourceToResourceEntry(
return true;
}
+void ConvertTeamDriveResourceToResourceEntry(
+ const google_apis::TeamDriveResource& input,
+ ResourceEntry* out_entry) {
+ DCHECK(out_entry);
+ out_entry->set_title(input.name());
+ out_entry->set_base_name(input.name());
+}
+
void ConvertResourceEntryToFileInfo(const ResourceEntry& entry,
base::File::Info* file_info) {
file_info->size = entry.file_info().size();
« no previous file with comments | « components/drive/resource_entry_conversion.h ('k') | components/drive/resource_entry_conversion_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698