Create VisualElementsManifest.xml from template -- install VisualElements in the version directory

chrome/installer/util/work_item_list.h

Index: chrome/installer/util/work_item_list.h
diff --git a/chrome/installer/util/work_item_list.h b/chrome/installer/util/work_item_list.h
index f334a4a40cf9a1643e3216120be00e4ceacc5999..3a389e933e13e87e853376da20e97d2519414a26 100644
--- a/chrome/installer/util/work_item_list.h
+++ b/chrome/installer/util/work_item_list.h
@@ -9,10 +9,11 @@
 #include <windows.h>
 
 #include <list>
-#include <string>
+#include <map>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/string16.h"
 #include "chrome/installer/util/work_item.h"
 
 class FilePath;
@@ -39,19 +40,19 @@ class WorkItemList : public WorkItem {
 
   // Add a CopyRegKeyWorkItem that recursively copies a given registry key.
   virtual WorkItem* AddCopyRegKeyWorkItem(HKEY predefined_root,
-                                          const std::wstring& source_key_path,
-                                          const std::wstring& dest_key_path,
+                                          const string16& source_key_path,
+                                          const string16& dest_key_path,
                                           CopyOverWriteOption overwrite_option);
 
   // Add a CopyTreeWorkItem to the list of work items.
   // See the NOTE in the documentation for the CopyTreeWorkItem class for
   // special considerations regarding |temp_dir|.
   virtual WorkItem* AddCopyTreeWorkItem(
-      const std::wstring& source_path,
-      const std::wstring& dest_path,
-      const std::wstring& temp_dir,
+      const string16& source_path,
+      const string16& dest_path,
+      const string16& temp_dir,
       CopyOverWriteOption overwrite_option,
-      const std::wstring& alternative_path = L"");
+      const string16& alternative_path = L"");
 
   // Add a CreateDirWorkItem that creates a directory at the given path.
   virtual WorkItem* AddCreateDirWorkItem(const FilePath& path);
@@ -59,18 +60,18 @@ class WorkItemList : public WorkItem {
   // Add a CreateRegKeyWorkItem that creates a registry key at the given
   // path.
   virtual WorkItem* AddCreateRegKeyWorkItem(HKEY predefined_root,
-                                            const std::wstring& path);
+                                            const string16& path);
 
   // Add a DeleteRegKeyWorkItem that deletes a registry key from the given
   // path.
   virtual WorkItem* AddDeleteRegKeyWorkItem(HKEY predefined_root,
-                                            const std::wstring& path);
+                                            const string16& path);
 
   // Add a DeleteRegValueWorkItem that deletes registry value of type REG_SZ
   // or REG_DWORD.
   virtual WorkItem* AddDeleteRegValueWorkItem(HKEY predefined_root,
-                                              const std::wstring& key_path,
-                                              const std::wstring& value_name);
+                                              const string16& key_path,
+                                              const string16& value_name);
 
   // Add a DeleteTreeWorkItem that recursively deletes a file system
   // hierarchy at the given root path. A key file can be optionally specified
@@ -84,40 +85,48 @@ class WorkItemList : public WorkItem {
   virtual WorkItem* AddDeleteTreeWorkItem(const FilePath& root_path,
                                           const FilePath& temp_path);
 
+  // Add a FileFromTemplateWorkItem to the list of work items.
+  // |source_path| should end with the .template extension.
+  virtual WorkItem* AddFileFromTemplateWorkItem(
+      const string16& source_path,
+      const string16& dest_path,
+      const string16& temp_dir,
+      const std::map<string16, string16>& mappings);
+
   // Add a MoveTreeWorkItem to the list of work items.
-  virtual WorkItem* AddMoveTreeWorkItem(const std::wstring& source_path,
-                                        const std::wstring& dest_path,
-                                        const std::wstring& temp_dir,
+  virtual WorkItem* AddMoveTreeWorkItem(const string16& source_path,
+                                        const string16& dest_path,
+                                        const string16& temp_dir,
                                         MoveTreeOption duplicate_option);
 
   // Add a SetRegValueWorkItem that sets a registry value with REG_SZ type
   // at the key with specified path.
   virtual WorkItem* AddSetRegValueWorkItem(HKEY predefined_root,
-                                           const std::wstring& key_path,
-                                           const std::wstring& value_name,
-                                           const std::wstring& value_data,
+                                           const string16& key_path,
+                                           const string16& value_name,
+                                           const string16& value_data,
                                            bool overwrite);
 
   // Add a SetRegValueWorkItem that sets a registry value with REG_DWORD type
   // at the key with specified path.
   virtual WorkItem* AddSetRegValueWorkItem(HKEY predefined_root,
-                                           const std::wstring& key_path,
-                                           const std::wstring& value_name,
+                                           const string16& key_path,
+                                           const string16& value_name,
                                            DWORD value_data,
                                            bool overwrite);
 
   // Add a SetRegValueWorkItem that sets a registry value with REG_QWORD type
   // at the key with specified path.
   virtual WorkItem* AddSetRegValueWorkItem(HKEY predefined_root,
-                                           const std::wstring& key_path,
-                                           const std::wstring& value_name,
+                                           const string16& key_path,
+                                           const string16& value_name,
                                            int64 value_data,
                                            bool overwrite);
 
   // Add a SelfRegWorkItem that registers or unregisters a DLL at the
   // specified path. If user_level_registration is true, then alternate
   // registration and unregistration entry point names will be used.
-  virtual WorkItem* AddSelfRegWorkItem(const std::wstring& dll_path,
+  virtual WorkItem* AddSelfRegWorkItem(const string16& dll_path,
                                        bool do_register,
                                        bool user_level_registration);