Add a flag to the installer that prevents the Add/Remove Programs uninstall shortcut from being created.

BUG=19370
TEST=Chrome installs without creating an uninstall shortcut. Nothing else drops off.

Review URL: http://codereview.chromium.org/661009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41160 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 0 deletions

diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index ab7bf06..0ac4e63 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -64,6 +64,7 @@ const wchar_t kDoNotRegisterForUpdateLaunch[] =
     L"do_not_register_for_update_launch";
 const wchar_t kMakeChromeDefault[] = L"make_chrome_default";
 const wchar_t kMakeChromeDefaultForUser[] = L"make_chrome_default_for_user";
+const wchar_t kMsi[] = L"msi";
 const wchar_t kRequireEula[] = L"require_eula";
 const wchar_t kSystemLevel[] = L"system_level";
 const wchar_t kVerboseLogging[] = L"verbose_logging";
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index cc7b8a1..178587f 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -55,6 +55,8 @@ extern const wchar_t kDoNotRegisterForUpdateLaunch[];
 extern const wchar_t kMakeChromeDefault[];
 // Boolean. Register Chrome as default browser for the current user.
 extern const wchar_t kMakeChromeDefaultForUser[];
+// Boolean. Expect to be run by an MSI installer. Cmd line override present.
+extern const wchar_t kMsi[];
 // Boolean. Show EULA dialog before install.
 extern const wchar_t kRequireEula[];
 // Boolean. Install Chrome to system wise location. Cmd line override present.
diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc
index aa3539e..261863d 100644
--- a/chrome/installer/util/util_constants.cc
+++ b/chrome/installer/util/util_constants.cc
@@ -62,6 +62,9 @@ const wchar_t kLogFile[] = L"log-file";
 // register as default browser only for the current user.
 const wchar_t kMakeChromeDefault[] = L"make-chrome-default";
 
+// Tells installer to expect to be run as a subsidiary to an MSI.
+const wchar_t kMsi[] = L"msi";
+
 // Useful only when used with --update-setup-exe, otherwise ignored. It
 // specifies the full path where updated setup.exe will be stored.
 const wchar_t kNewSetupExe[] = L"new-setup-exe";
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index 0b4eb34..7c0db12 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -65,6 +65,7 @@ extern const wchar_t kInstallArchive[];
 extern const wchar_t kInstallerData[];
 extern const wchar_t kLogFile[];
 extern const wchar_t kMakeChromeDefault[];
+extern const wchar_t kMsi[];
 extern const wchar_t kNewSetupExe[];
 extern const wchar_t kRegisterChromeBrowser[];
 extern const wchar_t kRegisterChromeBrowserSuffix[];