Merge 186681 "Added master_preferences to control shortcuts on w..."

chrome/installer/util/master_preferences_constants.cc

Index: chrome/installer/util/master_preferences_constants.cc
===================================================================
--- chrome/installer/util/master_preferences_constants.cc	(revision 188108)
+++ chrome/installer/util/master_preferences_constants.cc	(working copy)
@@ -25,9 +25,11 @@
   const char kDistroImportSearchPref[] = "import_search_engine";
   const char kDistroPingDelay[] = "ping_delay";
   const char kDistroSuppressFirstRunBubble[] = "suppress_first_run_bubble";
+  const char kDoNotCreateAnyShortcuts[] = "do_not_create_any_shortcuts";
   const char kDoNotCreateDesktopShortcut[] = "do_not_create_desktop_shortcut";
   const char kDoNotCreateQuickLaunchShortcut[] =
       "do_not_create_quick_launch_shortcut";
+  const char kDoNotCreateTaskbarShortcut[] = "do_not_create_taskbar_shortcut";
   const char kDoNotLaunchChrome[] = "do_not_launch_chrome";
   const char kDoNotRegisterForUpdateLaunch[] =
       "do_not_register_for_update_launch";