Implementing --app-launcher install/uninstall flow.

chrome/installer/util/installer_state.cc

 // 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.
 
 #include "chrome/installer/util/installer_state.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 76 matching lines @@
       package_type_(UNKNOWN_PACKAGE_TYPE),
       state_type_(BrowserDistribution::CHROME_BROWSER),
       root_key_(NULL),
       msi_(false),
       verbose_logging_(false),
       ensure_google_update_present_(false) {
   // Use set_level() so that root_key_ is updated properly.
   set_level(level);
 }
 
-void InstallerState::Initialize(const CommandLine& command_line,
+bool InstallerState::Initialize(const CommandLine& command_line,
                                 const MasterPreferences& prefs,
                                 const InstallationState& machine_state) {
   bool pref_bool;
   if (!prefs.GetBool(master_preferences::kSystemLevel, &pref_bool))
     pref_bool = false;
   set_level(pref_bool ? SYSTEM_LEVEL : USER_LEVEL);
 
   if (!prefs.GetBool(master_preferences::kVerboseLogging, &verbose_logging_))
     verbose_logging_ = false;
 
@@ skipping 16 matching lines @@
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
             << " distribution: " << p->distribution()->GetAppShortCutName();
   }
   if (prefs.install_chrome_frame()) {
     Product* p =
         AddProductFromPreferences(BrowserDistribution::CHROME_FRAME, prefs,
                                   machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
             << " distribution: " << p->distribution()->GetAppShortCutName();
   }
-  if (prefs.install_chrome_app_host()) {
+  if (prefs.install_chrome_app_launcher() || prefs.install_chrome_app_host()) {

[erikwright (departed), 2012/10/25 02:23:03]

It seems OK to me just to simplify this by treating the presence of both flags
as being the same as "--app-launcher".

If that doesn't cause problems elsewhere, I'd do it just to remove some code
complexity.

[huangs, 2012/10/29 21:15:16]

Done. So --app-host + --app-launcher = --app-launcher; and if App Launcher is
installed, then --app-host becomes --app-launcher.

+    // TODO(huangs): Revisit all these once App Launcher is default.
+    if (prefs.install_chrome_app_launcher() &&
+        prefs.install_chrome_app_host()) {
+      LOG(ERROR) << "Cannot have --" << installer::switches::kChromeAppHost
+                 << " with --" << installer::switches::kChromeAppLauncher;
+      return false;
+    }
+
     Product* p =
         AddProductFromPreferences(BrowserDistribution::CHROME_APP_HOST, prefs,
                                   machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
             << " distribution: " << p->distribution()->GetAppShortCutName();
   }
 
   if (!is_uninstall && is_multi_install()) {
     bool need_binaries = false;
     if (FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
@@ skipping 132 matching lines @@
         operand_distribution_type);
   }
 
   state_key_ = operand->GetStateKey();
   state_type_ = operand->GetType();
 
   // Parse --critical-update-version=W.X.Y.Z
   std::string critical_version_value(
       command_line.GetSwitchValueASCII(switches::kCriticalUpdateVersion));
   critical_update_version_ = Version(critical_version_value);
+  return true;
 }
 
 void InstallerState::set_level(Level level) {
   level_ = level;
   switch (level) {
     case USER_LEVEL:
       root_key_ = HKEY_CURRENT_USER;
       break;
     case SYSTEM_LEVEL:
       root_key_ = HKEY_LOCAL_MACHINE;
@@ skipping 443 matching lines @@
   if (is_multi_install()) {
     InstallUtil::AddInstallerResultItems(
         system_install, multi_package_binaries_distribution()->GetStateKey(),
         status, string_resource_id, launch_cmd, install_list.get());
   }
   if (!install_list->Do())
     LOG(ERROR) << "Failed to record installer error information in registry.";
 }
 
 }  // namespace installer