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

chrome/installer/util/master_preferences_constants.h

 // Copyright (c) 2012 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.
 //
 // This file contains the constants used to process master_preferences files
 // used by setup and first run.
 
 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_CONSTANTS_H_
 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_CONSTANTS_H_
 
@@ skipping 39 matching lines @@
 // Boolean pref that triggers silent import of the default browser history.
 extern const char kDistroImportHistoryPref[];
 // Boolean pref that triggers silent import of the default browser homepage.
 extern const char kDistroImportHomePagePref[];
 // Boolean pref that triggers silent import of the default search engine.
 extern const char kDistroImportSearchPref[];
 // Integer. RLZ ping delay in seconds.
 extern const char kDistroPingDelay[];
 // Boolean. Do not show first run bubble, even if it would otherwise be shown.
 extern const char kDistroSuppressFirstRunBubble[];
+// Boolean. Prevent creation of all shortcuts to chrome, including the
+// desktop, quick launch, taskbar and the start menu shortcuts.
+extern const char kDoNotCreateAnyShortcuts[];
 // Boolean. Prevent creation of the Desktop shortcut on install (and later on
 // Active Setup for each user on a system-level install).
 extern const char kDoNotCreateDesktopShortcut[];
 // Boolean. Prevent creation of the Quick Launch shortcut on install (and later
 // on Active Setup for each user on a system-level install).
 extern const char kDoNotCreateQuickLaunchShortcut[];
+// Boolean. Prevent creation of the Taskbar (since Windows 7) shortcut on
+// install (and later on Active Setup for each user on a system-level install).
+extern const char kDoNotCreateTaskbarShortcut[];
 // Boolean. Do not launch Chrome after first install. Cmd line override present.
 extern const char kDoNotLaunchChrome[];
 // Boolean. Do not register with Google Update to have Chrome launched after
 // install. Cmd line override present.
 extern const char kDoNotRegisterForUpdateLaunch[];
 // String.  Specifies the file path to write logging info to.
 extern const char kLogFile[];
 // Boolean. Register Chrome as default browser. Cmd line override present.
 extern const char kMakeChromeDefault[];
 // Boolean. Register Chrome as default browser for the current user.
@@ skipping 12 matching lines @@
 // Boolean. Install Chrome to system wise location. Cmd line override present.
 extern const char kSystemLevel[];
 // Boolean. Run installer in verbose mode. Cmd line override present.
 extern const char kVerboseLogging[];
 // Name of the block that contains the extensions on the master preferences.
 extern const char kExtensionsBlock[];
 }  // namespace master_preferences
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_CONSTANTS_H_