Disabling options that sxs channel does not support.

BUG=35574
TEST=Run setup with those options and "--chrome-sxs".

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

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

2 files changed, 47 insertions, 7 deletions

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 45642e4..e6db065 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -538,6 +538,29 @@ bool ShowRebootDialog() {
   return true;
 }
 
+// Class to manage COM initialization and uninitialization
+class AutoCom {
+ public:
+  AutoCom() : initialized_(false) { }
+  ~AutoCom() {
+    if (initialized_) CoUninitialize();
+  }
+  bool Init(bool system_install) {
+    if (CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) != S_OK) {
+      LOG(ERROR) << "COM initialization failed.";
+      InstallUtil::WriteInstallerResult(system_install,
+                                        installer_util::OS_ERROR,
+                                        IDS_INSTALL_OS_ERROR_BASE, NULL);
+      return false;
+    }
+    initialized_ = true;
+    return true;
+  }
+
+ private:
+  bool initialized_;
+};
+
 }  // namespace
 
 int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
@@ -571,11 +594,8 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
   }
 
   // Initialize COM for use later.
-  if (CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) != S_OK) {
-    LOG(ERROR) << "COM initialization failed.";
-    InstallUtil::WriteInstallerResult(system_install,
-                                      installer_util::OS_ERROR,
-                                      IDS_INSTALL_OS_ERROR_BASE, NULL);
+  AutoCom auto_com;
+  if (!auto_com.Init(system_install)) {
     return installer_util::OS_ERROR;
   }
 
@@ -584,6 +604,25 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
                                      exit_code))
     return exit_code;
 
+  // Some command line options don't work with SxS install/uninstall
+  if (InstallUtil::IsChromeSxSProcess()) {
+    if (system_install ||
+        parsed_command_line.HasSwitch(
+            installer_util::switches::kForceUninstall) ||
+        parsed_command_line.HasSwitch(
+            installer_util::switches::kMakeChromeDefault) ||
+        parsed_command_line.HasSwitch(
+            installer_util::switches::kRegisterChromeBrowser) ||
+        parsed_command_line.HasSwitch(
+            installer_util::switches::kRemoveChromeRegistration) ||
+        parsed_command_line.HasSwitch(
+            installer_util::switches::kInactiveUserToast) ||
+        parsed_command_line.HasSwitch(
+            installer_util::switches::kSystemLevelToast)) {
+      return installer_util::SXS_OPTION_NOT_SUPPORTED;
+    }
+  }
+
   if (system_install && !IsUserAnAdmin()) {
     if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
         !parsed_command_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
@@ -644,7 +683,6 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
     }
   }
 
-  CoUninitialize();
   // Note that we allow the status installer_util::UNINSTALL_REQUIRES_REBOOT
   // to pass through, since this is only returned on uninstall which is never
   // invoked directly by Google Update.
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index a197303..1fc582f 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -43,7 +43,9 @@ enum InstallStatus {
   UNINSTALL_REQUIRES_REBOOT, // Uninstallation required a reboot.
   IN_USE_UPDATED,        // Chrome successfully updated but old version running
   SAME_VERSION_REPAIR_FAILED, // Chrome repair failed as Chrome was running
-  REENTRY_SYS_UPDATE     // Setup has been re-lauched as the interactive user
+  REENTRY_SYS_UPDATE,    // Setup has been re-lauched as the interactive user
+  SXS_OPTION_NOT_SUPPORTED  // The chrome-sxs option provided does not work
+                            // with other command line options.
 };
 
 namespace switches {