Media Galleries API Picasa: Put INI indexing step into sandboxed utility process.

chrome/common/chrome_utility_messages.h

 // 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.
 
 // Multiply-included message file, so no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 62 matching lines @@
 IPC_STRUCT_TRAITS_BEGIN(picasa::AlbumTableFilesForTransit)
   IPC_STRUCT_TRAITS_MEMBER(indicator_file)
   IPC_STRUCT_TRAITS_MEMBER(category_file)
   IPC_STRUCT_TRAITS_MEMBER(date_file)
   IPC_STRUCT_TRAITS_MEMBER(filename_file)
   IPC_STRUCT_TRAITS_MEMBER(name_file)
   IPC_STRUCT_TRAITS_MEMBER(token_file)
   IPC_STRUCT_TRAITS_MEMBER(uid_file)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(picasa::FolderINIContents)
+  IPC_STRUCT_TRAITS_MEMBER(folder_path)
+  IPC_STRUCT_TRAITS_MEMBER(ini_contents)
+IPC_STRUCT_TRAITS_END()
+
 //------------------------------------------------------------------------------
 // Utility process messages:
 // These are messages from the browser to the utility process.
 
 // Tell the utility process to unpack the given extension file in its
 // directory and verify that it is valid.
 IPC_MESSAGE_CONTROL4(ChromeUtilityMsg_UnpackExtension,
                      base::FilePath /* extension_filename */,
                      std::string /* extension_id */,
                      int /* Manifest::Location */,
@@ skipping 68 matching lines @@
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // Tell the utility process to parse the iTunes library XML file and
 // return the parse result as well as the iTunes library as an itunes::Library.
 IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_ParseITunesLibraryXmlFile,
                      IPC::PlatformFileForTransit /* XML file to parse */)
 
 // Tells the utility process to parse the Picasa PMP database and return a
 // listing of the user's Picasa albums and folders, along with metadata.
 IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_ParsePicasaPMPDatabase,
                      picasa::AlbumTableFilesForTransit /* album_table_files */)
+
+// Tells the utility process to index the Picasa user-created Album contents
+// by parsing all the INI files in Picasa Folders.
+IPC_MESSAGE_CONTROL2(ChromeUtilityMsg_IndexPicasaAlbumsContents,
+                     picasa::AlbumUIDSet /* album_uids */,
+                     std::vector<picasa::FolderINIContents> /* folders_inis */)
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 //------------------------------------------------------------------------------
 // Utility process host messages:
 // These are messages from the utility process to the browser.
 
 // Reply when the utility process is done unpacking an extension.  |manifest|
 // is the parsed manifest.json file.
 // The unpacker should also have written out files containing the decoded
 // images and message catalogs from the extension. See extensions::Unpacker for
@@ skipping 97 matching lines @@
 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GotITunesLibrary,
                      bool /* Parser result */,
                      itunes::parser::Library /* iTunes library */)
 
 // Reply after parsing the Picasa PMP Database with the parser result and a
 // listing of the user's Picasa albums and folders, along with metadata.
 IPC_MESSAGE_CONTROL3(ChromeUtilityHostMsg_ParsePicasaPMPDatabase_Finished,
                      bool /* parse_success */,
                      std::vector<picasa::AlbumInfo> /* albums */,
                      std::vector<picasa::AlbumInfo> /* folders */)
+
+// Reply after indexing the Picasa user-created Album contents by parsing all
+// the INI files in Picasa Folders.
+IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished,
+                     picasa::AlbumImagesMap /* albums_images */)
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)