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

chrome/installer/setup/install.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <shlobj.h>
 #include <time.h>
 
 #include "chrome/installer/setup/install.h"
 
 #include "base/file_util.h"
@@ skipping 522 matching lines @@
     } else {
       LOG(ERROR) << "Not sure how we got here."
                  << " New version: " << new_version.GetString()
                  << ", installed version: " << installed_version->GetString();
       // This should never happen but we are seeing some inconsistent exit
       // code reports in Omaha logs. We will treat this case as update to
       // see if the inconsistency goes away.
       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;
 }
 
 std::wstring installer::GetInstallerPathUnderChrome(
     const std::wstring& install_path, const std::wstring& new_version) {
   std::wstring installer_path(install_path);
   file_util::AppendToPath(&installer_path, new_version);
   file_util::AppendToPath(&installer_path, installer_util::kInstallerDir);
   return installer_path;
 }