Added master_preferences to control shortcuts on windows.

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index f4770806bbf9b8f3740150bcf81543a066120ce7..41a8fbf8bc2f91051dfd27a28a1298257f13875a 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -360,14 +360,23 @@ void CreateOrUpdateShortcuts(
     const MasterPreferences& prefs,
     InstallShortcutLevel install_level,
     InstallShortcutOperation install_operation) {
+  bool do_not_create_any_shortcuts = false;
+  prefs.GetBool(master_preferences::kDoNotCreateAnyShortcuts,
+                &do_not_create_any_shortcuts);
+  if (do_not_create_any_shortcuts)
+    return;
+
   // Extract shortcut preferences from |prefs|.
   bool do_not_create_desktop_shortcut = false;
   bool do_not_create_quick_launch_shortcut = false;
+  bool do_not_create_taskbar_shortcut = false;
   bool alternate_desktop_shortcut = false;
   prefs.GetBool(master_preferences::kDoNotCreateDesktopShortcut,
                 &do_not_create_desktop_shortcut);
   prefs.GetBool(master_preferences::kDoNotCreateQuickLaunchShortcut,
                 &do_not_create_quick_launch_shortcut);
+  prefs.GetBool(master_preferences::kDoNotCreateTaskbarShortcut,
+                &do_not_create_taskbar_shortcut);
   prefs.GetBool(master_preferences::kAltShortcutText,
                 &alternate_desktop_shortcut);
 
@@ -438,7 +447,8 @@ void CreateOrUpdateShortcuts(
   if (shortcut_operation == ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS ||
       shortcut_operation ==
           ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL) {
-    start_menu_properties.set_pin_to_taskbar(true);
+    if (!do_not_create_taskbar_shortcut)

[gab, 2013/03/06 23:18:16]

Please nest this condition in the if above it, i.e.:

if (!do_not_create_taskbar_shortcut &&
    (shortcut_operation == ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS ||
     shortcut_operation ==
         ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL)) {

[Joao da Silva, 2013/03/07 07:13:43]

Done.

+      start_menu_properties.set_pin_to_taskbar(true);
   }
   ExecuteAndLogShortcutOperation(ShellUtil::SHORTCUT_LOCATION_START_MENU,
                                  dist, start_menu_properties,