| Index: chrome/browser/drive/drive_api_util.cc
|
| diff --git a/chrome/browser/drive/drive_api_util.cc b/chrome/browser/drive/drive_api_util.cc
|
| index 13cefa6c91ffa4dbbe199e0393d57cd1f6d5c8fc..311c03a62393a33e71bd810048db160fc9145fff 100644
|
| --- a/chrome/browser/drive/drive_api_util.cc
|
| +++ b/chrome/browser/drive/drive_api_util.cc
|
| @@ -25,25 +25,6 @@ namespace drive {
|
| namespace util {
|
| namespace {
|
|
|
| -std::string GetMimeTypeFromEntryKind(google_apis::DriveEntryKind kind) {
|
| - switch (kind) {
|
| - case google_apis::ENTRY_KIND_DOCUMENT:
|
| - return kGoogleDocumentMimeType;
|
| - case google_apis::ENTRY_KIND_SPREADSHEET:
|
| - return kGoogleSpreadsheetMimeType;
|
| - case google_apis::ENTRY_KIND_PRESENTATION:
|
| - return kGooglePresentationMimeType;
|
| - case google_apis::ENTRY_KIND_DRAWING:
|
| - return kGoogleDrawingMimeType;
|
| - case google_apis::ENTRY_KIND_TABLE:
|
| - return kGoogleTableMimeType;
|
| - case google_apis::ENTRY_KIND_FORM:
|
| - return kGoogleFormMimeType;
|
| - default:
|
| - return std::string();
|
| - }
|
| -}
|
| -
|
| // Returns the argument string.
|
| std::string Identity(const std::string& resource_id) { return resource_id; }
|
|
|
| @@ -173,74 +154,6 @@ void ParseShareUrlAndRun(const google_apis::GetShareUrlCallback& callback,
|
| callback.Run(error, share_link ? share_link->href() : GURL());
|
| }
|
|
|
| -scoped_ptr<google_apis::FileResource> ConvertResourceEntryToFileResource(
|
| - const google_apis::ResourceEntry& entry) {
|
| - scoped_ptr<google_apis::FileResource> file(new google_apis::FileResource);
|
| -
|
| - file->set_file_id(entry.resource_id());
|
| - file->set_title(entry.title());
|
| - file->set_created_date(entry.published_time());
|
| -
|
| - if (std::find(entry.labels().begin(), entry.labels().end(),
|
| - "shared-with-me") != entry.labels().end()) {
|
| - // Set current time to mark the file is shared_with_me, since ResourceEntry
|
| - // doesn't have |shared_with_me_date| equivalent.
|
| - file->set_shared_with_me_date(base::Time::Now());
|
| - }
|
| -
|
| - file->set_shared(std::find(entry.labels().begin(), entry.labels().end(),
|
| - "shared") != entry.labels().end());
|
| -
|
| - if (entry.is_folder()) {
|
| - file->set_mime_type(kDriveFolderMimeType);
|
| - } else {
|
| - std::string mime_type = GetMimeTypeFromEntryKind(entry.kind());
|
| - if (mime_type.empty())
|
| - mime_type = entry.content_mime_type();
|
| - file->set_mime_type(mime_type);
|
| - }
|
| -
|
| - file->set_md5_checksum(entry.file_md5());
|
| - file->set_file_size(entry.file_size());
|
| -
|
| - file->mutable_labels()->set_trashed(entry.deleted());
|
| - file->set_etag(entry.etag());
|
| -
|
| - google_apis::ImageMediaMetadata* image_media_metadata =
|
| - file->mutable_image_media_metadata();
|
| - image_media_metadata->set_width(entry.image_width());
|
| - image_media_metadata->set_height(entry.image_height());
|
| - image_media_metadata->set_rotation(entry.image_rotation());
|
| -
|
| - std::vector<google_apis::ParentReference>* parents = file->mutable_parents();
|
| - for (size_t i = 0; i < entry.links().size(); ++i) {
|
| - using google_apis::Link;
|
| - const Link& link = *entry.links()[i];
|
| - switch (link.type()) {
|
| - case Link::LINK_PARENT: {
|
| - google_apis::ParentReference parent;
|
| - parent.set_parent_link(link.href());
|
| -
|
| - std::string file_id =
|
| - drive::util::ExtractResourceIdFromUrl(link.href());
|
| - parent.set_file_id(file_id);
|
| - parents->push_back(parent);
|
| - break;
|
| - }
|
| - case Link::LINK_ALTERNATE:
|
| - file->set_alternate_link(link.href());
|
| - break;
|
| - default:
|
| - break;
|
| - }
|
| - }
|
| -
|
| - file->set_modified_date(entry.updated_time());
|
| - file->set_last_viewed_by_me_date(entry.last_viewed_time());
|
| -
|
| - return file.Pass();
|
| -}
|
| -
|
| google_apis::DriveEntryKind GetKind(
|
| const google_apis::FileResource& file_resource) {
|
| if (file_resource.IsDirectory())
|
|
|