Adding a --do-not-create-shortcuts icons command line switch to the installer to prev...

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
===================================================================
--- chrome/installer/setup/install.cc	(revision 25720)
+++ chrome/installer/setup/install.cc	(working copy)
@@ -540,21 +540,25 @@
       result = installer_util::NEW_VERSION_UPDATED;
     }
 
-    bool create_all_shortcut = installer_util::GetDistroBooleanPreference(prefs,
-        installer_util::master_preferences::kCreateAllShortcuts);
-    bool alt_shortcut = installer_util::GetDistroBooleanPreference(prefs,
-        installer_util::master_preferences::kAltShortcutText);
-    if (!CreateOrUpdateChromeShortcuts(exe_path, install_path,
-                                       new_version.GetString(), result,
-                                       system_install, create_all_shortcut,
-                                       alt_shortcut))
-      LOG(WARNING) << "Failed to create/update start menu shortcut.";
+    if (!installer_util::GetDistroBooleanPreference(prefs,
+            installer_util::master_preferences::kDoNotCreateShortcuts)) {
+      bool create_all_shortcut = installer_util::GetDistroBooleanPreference(
+          prefs, installer_util::master_preferences::kCreateAllShortcuts);
+      bool alt_shortcut = installer_util::GetDistroBooleanPreference(prefs,
+          installer_util::master_preferences::kAltShortcutText);
+      if (!CreateOrUpdateChromeShortcuts(exe_path, install_path,
+                                         new_version.GetString(), result,
+                                         system_install, create_all_shortcut,
+                                         alt_shortcut))
+        LOG(WARNING) << "Failed to create/update start menu shortcut.";
 
+      bool make_chrome_default = installer_util::GetDistroBooleanPreference(
+          prefs, installer_util::master_preferences::kMakeChromeDefault);
+      RegisterChromeOnMachine(install_path, system_install,
+                              make_chrome_default);
+    }
+
     RemoveOldVersionDirs(install_path, new_version.GetString());
-
-    bool make_chrome_default = installer_util::GetDistroBooleanPreference(prefs,
-        installer_util::master_preferences::kMakeChromeDefault);
-    RegisterChromeOnMachine(install_path, system_install, make_chrome_default);
   }
 
   return result;