Index: chrome/browser/chromeos/gdata/drive_api_parser.cc |
diff --git a/chrome/browser/chromeos/gdata/drive_api_parser.cc b/chrome/browser/chromeos/gdata/drive_api_parser.cc |
index d906ca4e032e559ca3ed53f1ddd9b2245eba8f89..6084e8665347993fa78065684a6d85e5ef86ced4 100644 |
--- a/chrome/browser/chromeos/gdata/drive_api_parser.cc |
+++ b/chrome/browser/chromeos/gdata/drive_api_parser.cc |
@@ -32,25 +32,32 @@ bool GetGURLFromString(const base::StringPiece& url_string, GURL* result) { |
// Drive v2 API JSON names. |
+// Definition order follows the order of documentation in |
+// https://developers.google.com/drive/v2/reference/ |
+ |
// Common |
const char kKind[] = "kind"; |
const char kId[] = "id"; |
const char kETag[] = "etag"; |
+const char kSelfLink[] = "selfLink"; |
const char kItems[] = "items"; |
const char kLargestChangeId[] = "largestChangeId"; |
-// About Resource: |
+// About Resource |
+// https://developers.google.com/drive/v2/reference/about |
const char kAboutKind[] = "drive#about"; |
-const char kRootFolderId[] = "rootFolderId"; |
const char kQuotaBytesTotal[] = "quotaBytesTotal"; |
const char kQuotaBytesUsed[] = "quotaBytesUsed"; |
+const char kRootFolderId[] = "rootFolderId"; |
-// App Icon: |
+// App Icon |
+// https://developers.google.com/drive/v2/reference/apps |
const char kCategory[] = "category"; |
const char kSize[] = "size"; |
const char kIconUrl[] = "iconUrl"; |
-// Apps Resource: |
+// Apps Resource |
+// https://developers.google.com/drive/v2/reference/apps |
const char kAppKind[] = "drive#app"; |
const char kName[] = "name"; |
const char kObjectType[] = "objectType"; |
@@ -65,37 +72,49 @@ const char kPrimaryFileExtensions[] = "primaryFileExtensions"; |
const char kSecondaryFileExtensions[] = "secondaryFileExtensions"; |
const char kIcons[] = "icons"; |
-// Apps List: |
+// Apps List |
+// https://developers.google.com/drive/v2/reference/apps/list |
const char kAppListKind[] = "drive#appList"; |
-// Parent Resource: |
+// Parent Resource |
+// https://developers.google.com/drive/v2/reference/parents |
const char kParentReferenceKind[] = "drive#parentReference"; |
+const char kParentLink[] = "parentLink"; |
const char kIsRoot[] = "isRoot"; |
-// File Resource: |
+// File Resource |
+// https://developers.google.com/drive/v2/reference/files |
const char kFileKind[] = "drive#file"; |
-const char kMimeType[] = "mimeType"; |
const char kTitle[] = "title"; |
+const char kMimeType[] = "mimeType"; |
+const char kCreatedDate[] = "createdDate"; |
const char kModifiedByMeDate[] = "modifiedByMeDate"; |
-const char kParents[] = "parents"; |
const char kDownloadUrl[] = "downloadUrl"; |
const char kFileExtension[] = "fileExtension"; |
const char kMd5Checksum[] = "md5Checksum"; |
const char kFileSize[] = "fileSize"; |
+const char kAlternateLink[] = "alternateLink"; |
+const char kEmbedLink[] = "embedLink"; |
+const char kParents[] = "parents"; |
+const char kThumbnailLink[] = "thumbnailLink"; |
+const char kWebContentLink[] = "webContentLink"; |
const char kDriveFolderMimeType[] = "application/vnd.google-apps.folder"; |
-// Files List: |
+// Files List |
+// https://developers.google.com/drive/v2/reference/files/list |
const char kFileListKind[] = "drive#fileList"; |
const char kNextPageToken[] = "nextPageToken"; |
const char kNextLink[] = "nextLink"; |
-// Change Resource: |
+// Change Resource |
+// https://developers.google.com/drive/v2/reference/changes |
const char kChangeKind[] = "drive#change"; |
const char kFileId[] = "fileId"; |
const char kFile[] = "file"; |
-// Changes List: |
+// Changes List |
+// https://developers.google.com/drive/v2/reference/changes/list |
const char kChangeListKind[] = "drive#changeList"; |
// Maps category name to enum IconCategory. |
@@ -319,6 +338,9 @@ ParentReference::~ParentReference() {} |
void ParentReference::RegisterJSONConverter( |
base::JSONValueConverter<ParentReference>* converter) { |
converter->RegisterStringField(kId, &ParentReference::file_id_); |
+ converter->RegisterCustomField<GURL>(kParentLink, |
+ &ParentReference::parent_link_, |
+ GetGURLFromString); |
converter->RegisterBoolField(kIsRoot, &ParentReference::is_root_); |
} |
@@ -358,20 +380,39 @@ void FileResource::RegisterJSONConverter( |
converter->RegisterStringField(kMimeType, &FileResource::mime_type_); |
converter->RegisterStringField(kTitle, &FileResource::title_); |
converter->RegisterCustomField<base::Time>( |
hashimoto
2012/08/07 05:55:04
Could you order these too?
kochi
2012/08/07 06:30:37
Done.
|
+ kCreatedDate, |
+ &FileResource::created_date_, |
+ &gdata::util::GetTimeFromString); |
+ converter->RegisterCustomField<base::Time>( |
kModifiedByMeDate, |
&FileResource::modified_by_me_date_, |
&gdata::util::GetTimeFromString); |
converter->RegisterRepeatedMessage<ParentReference>(kParents, |
&FileResource::parents_); |
- converter->RegisterCustomField<GURL>(kDownloadUrl, |
- &FileResource::download_url_, |
- GetGURLFromString); |
converter->RegisterStringField(kFileExtension, |
&FileResource::file_extension_); |
converter->RegisterStringField(kMd5Checksum, &FileResource::md5_checksum_); |
converter->RegisterCustomField<int64>(kFileSize, |
&FileResource::file_size_, |
&base::StringToInt64); |
+ converter->RegisterCustomField<GURL>(kDownloadUrl, |
+ &FileResource::download_url_, |
+ GetGURLFromString); |
+ converter->RegisterCustomField<GURL>(kSelfLink, |
+ &FileResource::self_link_, |
+ GetGURLFromString); |
+ converter->RegisterCustomField<GURL>(kAlternateLink, |
+ &FileResource::alternate_link_, |
+ GetGURLFromString); |
+ converter->RegisterCustomField<GURL>(kEmbedLink, |
+ &FileResource::embed_link_, |
+ GetGURLFromString); |
+ converter->RegisterCustomField<GURL>(kThumbnailLink, |
+ &FileResource::thumbnail_link_, |
+ GetGURLFromString); |
+ converter->RegisterCustomField<GURL>(kWebContentLink, |
+ &FileResource::web_content_link_, |
+ GetGURLFromString); |
} |
// static |