Installer: adding ResolveShortcutProperties(); updating shortcut icons during shortcut migration.

base/win/shortcut.h

Index: base/win/shortcut.h
diff --git a/base/win/shortcut.h b/base/win/shortcut.h
index 0f5fb0f686be84e521f8ee403a5a3b903053c353..505ac6a47a76225c641e35da43e5594d27190f12 100644
--- a/base/win/shortcut.h
+++ b/base/win/shortcut.h
@@ -118,11 +118,22 @@ BASE_EXPORT bool CreateOrUpdateShortcutLink(
     ShortcutOperation operation);
 
 // Resolve Windows shortcut (.LNK file)
-// This methods tries to resolve a shortcut .LNK file. The path of the shortcut
-// to resolve is in |shortcut_path|. If |target_path| is not NULL, the target
-// will be resolved and placed in |target_path|. If |args| is not NULL, the
-// arguments will be retrieved and placed in |args|. The function returns true
-// if all requested fields are found successfully.
+// This methods tries to resolve selected properties of a shortcut .LNK file.
+// The path of the shortcut to resolve is in |shortcut_path|. |options| is a bit
+// field composed of ShortcutProperties::IndividualProperties, to specify which
+// properties to read. It should be non-0. The resulting data are read into
+// |properties|, which must not be NULL. The function returns true if all
+// requested properties are successfully read. Otherwise some reads have failed,
+//  and intermediate values written to |properties| should be ignored.

[gab, 2014/01/02 15:51:46]

Remove leading space on this line and ',' on line 126.

[huangs, 2014/01/02 19:58:22]

Done.

+BASE_EXPORT bool ResolveShortcutProperties(const FilePath& shortcut_path,
+                                           uint32 options,
+                                           ShortcutProperties* properties);
+
+// Resolve Windows shortcut (.LNK file).

[gab, 2014/01/02 15:51:46]

s/Resolve/Resolves

[huangs, 2014/01/02 19:58:22]

Done. Also changed line 120.

+// This is a wrapper to ResolveShortcutProperties() to handle the commonly used
+// cases of resolving target and arguments. |target_path| and |args| are

[gab, 2014/01/02 15:51:46]

s/commonly used cases/common use case

[huangs, 2014/01/02 19:58:22]

Done.

+// optional output variables that are ignored if NULL.
+// The function returns true if all requested fields are found successfully.
 // Callers can safely use the same variable for both |shortcut_path| and
 // |target_path|.
 BASE_EXPORT bool ResolveShortcut(const FilePath& shortcut_path,