Media Galleries API: Audio/Video attached pictures support.

chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 50 matching lines @@
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #include "chrome/utility/media_galleries/iapps_xml_utils.h"
 #include "chrome/utility/media_galleries/itunes_library_parser.h"
 #include "chrome/utility/media_galleries/picasa_album_table_reader.h"
 #include "chrome/utility/media_galleries/picasa_albums_indexer.h"
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
+#include "chrome/common/media_galleries/metadata_types.h"
 #include "chrome/utility/media_galleries/image_metadata_extractor.h"
 #include "chrome/utility/media_galleries/ipc_data_source.h"
 #include "chrome/utility/media_galleries/media_metadata_parser.h"
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/common/crash_keys.h"
 #include "printing/backend/print_backend.h"
 #endif
 
@@ skipping 215 matching lines @@
 };
 
 typedef PdfFunctionsWin PdfFunctions;
 #else  // OS_WIN
 typedef PdfFunctionsBase PdfFunctions;
 #endif  // OS_WIN
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 void FinishParseMediaMetadata(
     metadata::MediaMetadataParser* parser,
-    scoped_ptr<extensions::api::media_galleries::MediaMetadata> metadata) {
+    scoped_ptr<extensions::api::media_galleries::MediaMetadata> metadata,
+    const std::vector<metadata::AttachedPicture>& attached_pictures) {
   Send(new ChromeUtilityHostMsg_ParseMediaMetadata_Finished(
-      true, *(metadata->ToValue().get())));
+      true, *(metadata->ToValue().get()), attached_pictures));
   ReleaseProcessIfNeeded();
 }
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 static base::LazyInstance<PdfFunctions> g_pdf_lib = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ChromeContentUtilityClient::ChromeContentUtilityClient()
     : filter_messages_(false) {
@@ skipping 593 matching lines @@
     const IPC::PlatformFileForTransit& media_file) {
   media::MediaFileChecker checker(
       base::File(IPC::PlatformFileForTransitToPlatformFile(media_file)));
   const bool check_success = checker.Start(
       base::TimeDelta::FromMilliseconds(milliseconds_of_decoding));
   Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(check_success));
   ReleaseProcessIfNeeded();
 }
 
 void ChromeContentUtilityClient::OnParseMediaMetadata(
-    const std::string& mime_type,
-    int64 total_size) {
+    const std::string& mime_type, int64 total_size,
+    bool get_attached_pictures) {
   // Only one IPCDataSource may be created and added to the list of handlers.
   metadata::IPCDataSource* source = new metadata::IPCDataSource(total_size);
   handlers_.push_back(source);
 
-  metadata::MediaMetadataParser* parser =
-      new metadata::MediaMetadataParser(source, mime_type);
+  metadata::MediaMetadataParser* parser = new metadata::MediaMetadataParser(
+      source, mime_type, get_attached_pictures);
   parser->Start(base::Bind(&FinishParseMediaMetadata, base::Owned(parser)));
 }
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 #if defined(OS_WIN)
 void ChromeContentUtilityClient::OnParseITunesPrefXml(
     const std::string& itunes_xml_data) {
   base::FilePath library_path(
       itunes::FindLibraryLocationInPrefXml(itunes_xml_data));
   Send(new ChromeUtilityHostMsg_GotITunesDirectory(library_path));
@@ skipping 80 matching lines @@
     NetworkingPrivateCrypto crypto;
     success = crypto.EncryptByteString(public_key, key_data, &ciphertext);
   }
 
   Send(new ChromeUtilityHostMsg_GotEncryptedWiFiCredentials(ciphertext,
                                                             success));
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace chrome