Files.app: Add an private API to get a download URL

chrome/browser/drive/drive_api_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/drive/drive_api_util.h"
 
 #include <string>
 
 #include "base/files/file.h"
 #include "base/logging.h"
@@ skipping 132 matching lines @@
   return resource_id;
 }
 
 ResourceIdCanonicalizer GetIdentityResourceIdCanonicalizer() {
   return base::Bind(&Identity);
 }
 
 const char kDocsListScope[] = "https://docs.google.com/feeds/";
 const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
 
-void ParseShareUrlAndRun(const google_apis::GetShareUrlCallback& callback,
+void ParseShareUrlAndRun(const google_apis::GetUrlCallback& callback,
                          google_apis::GDataErrorCode error,
                          scoped_ptr<base::Value> value) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   if (!value) {
     callback.Run(error, GURL());
     return;
   }
 
   // Parsing ResourceEntry is cheap enough to do on UI thread.
   scoped_ptr<google_apis::ResourceEntry> entry =
       google_apis::ResourceEntry::ExtractAndParse(*value);
   if (!entry) {
     callback.Run(google_apis::GDATA_PARSE_ERROR, GURL());
     return;
   }
 
   const google_apis::Link* share_link =
       entry->GetLinkByType(google_apis::Link::LINK_SHARE);
   callback.Run(error, share_link ? share_link->href() : GURL());
 }
 
 scoped_ptr<google_apis::FileResource> ConvertResourceEntryToFileResource(

[hashimoto, 2014/07/09 07:48:57]

This function is unused now.
Could you remove this function? (it can be in a separate patch)

[yoshiki, 2014/07/11 13:48:50]

I'll do it in the separate patch.
https://codereview.chromium.org/381423002/

     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());
 
+  file->set_download_url(entry.download_url());
   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());
@@ skipping 75 matching lines @@
   std::vector<std::string> labels;
   if (!file_resource.shared_with_me_date().is_null())
     labels.push_back("shared-with-me");
   if (file_resource.shared())
     labels.push_back("shared");
   entry->set_labels(labels);
 
   // This should be the url to download the file_resource.
   {
     google_apis::Content content;
+    content.set_url(file_resource.download_url());
     content.set_mime_type(file_resource.mime_type());
     entry->set_content(content);
   }
   // TODO(kochi): entry->resource_links_
 
   // For file entries
   entry->set_filename(file_resource.title());
   entry->set_suggested_filename(file_resource.title());
   entry->set_file_md5(file_resource.md5_checksum());
   entry->set_file_size(file_resource.file_size());
@@ skipping 131 matching lines @@
 
   base::MD5Digest digest;
   base::MD5Final(&digest, &context);
   return MD5DigestToBase16(digest);
 }
 
 const char kWapiRootDirectoryResourceId[] = "folder:root";
 
 }  // namespace util
 }  // namespace drive