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..51b81d823613bdee1dc689446c42a34cbb9af0e5 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -363,11 +363,17 @@ void CreateOrUpdateShortcuts(
   // 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 do_not_create_any_shortcuts = 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::kDoNotCreateAnyShortcuts,
+                &do_not_create_any_shortcuts);
   prefs.GetBool(master_preferences::kAltShortcutText,
                 &alternate_desktop_shortcut);
 
@@ -430,19 +436,24 @@ void CreateOrUpdateShortcuts(
         quick_launch_properties, shortcut_operation);
   }
 
-  ShellUtil::ShortcutProperties start_menu_properties(base_properties);
-  // IMPORTANT: Only the default (no arguments and default browserappid) browser
-  // shortcut in the Start menu (Start screen on Win8+) should be made dual
-  // mode.
-  start_menu_properties.set_dual_mode(true);
-  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);
+  // Currently, |do_not_create_any_shortcuts| only affects the creation of the

[gab, 2013/03/06 20:20:32]

I was seeing more "do_not_create_any_shortcuts" as a meta pref to rule them all
(i.e., if you have only that one it still prevents creation of any shortcuts
(i.e., returns early from this method)).

The other preferences are useful for people who want to tweak which shortcut to
not create instead of using the big "do_not_create_any_shortcuts" hammer.

[Joao da Silva, 2013/03/06 21:21:33]

Makes sense, done.

+  // start menu shortcut; all the other do_not_* flags are overridden by
+  // |do_not_create_any_shortcuts|.
+  if (!do_not_create_any_shortcuts) {
+    ShellUtil::ShortcutProperties start_menu_properties(base_properties);
+    // IMPORTANT: Only the default (no arguments and default browserappid)
+    // browser shortcut in the Start menu (Start screen on Win8+) should be made
+    // dual mode.
+    start_menu_properties.set_dual_mode(true);
+    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(!do_not_create_taskbar_shortcut);

[gab, 2013/03/06 20:20:32]

Shouldn't set this bit if (!do_not_create_taskbar_shortcut).

[Joao da Silva, 2013/03/06 21:21:33]

Done (this was just setting it to false in that case, but an explicit if is
clearer)

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

Oh my bad, I had missed this change (had assumed the diff was just an indent
plus the if above...). I also prefer it in an explicit if above FWIW anyways.

+    }
+    ExecuteAndLogShortcutOperation(ShellUtil::SHORTCUT_LOCATION_START_MENU,
+                                   dist, start_menu_properties,
+                                   shortcut_operation);
   }
-  ExecuteAndLogShortcutOperation(ShellUtil::SHORTCUT_LOCATION_START_MENU,
-                                 dist, start_menu_properties,
-                                 shortcut_operation);
 }
 
 void RegisterChromeOnMachine(const InstallerState& installer_state,