| Index: chrome/utility/chrome_content_utility_client.cc
|
| diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
|
| index 7390adb3e50d85838ae4d1e3f79037af7f2f7723..5432cf8bd25f7897c3fb8bf025f2a955fade9f72 100644
|
| --- a/chrome/utility/chrome_content_utility_client.cc
|
| +++ b/chrome/utility/chrome_content_utility_client.cc
|
| @@ -303,9 +303,12 @@ typedef PdfFunctionsBase PdfFunctions;
|
| #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<std::string>& attached_pictures_bytes,
|
| + const std::vector<std::string>& attached_pictures_types) {
|
| Send(new ChromeUtilityHostMsg_ParseMediaMetadata_Finished(
|
| - true, *(metadata->ToValue().get())));
|
| + true, *(metadata->ToValue().get()), attached_pictures_bytes,
|
| + attached_pictures_types));
|
| ReleaseProcessIfNeeded();
|
| }
|
| #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
|
| @@ -919,14 +922,14 @@ void ChromeContentUtilityClient::OnCheckMediaFile(
|
| }
|
|
|
| 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)
|
|
|