Implementing unified Chrome / App Launcher flow, and migrating old stand-alone App Launcher.

chrome/installer/util/installer_state.cc

Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index 00906292c31514cf2d4333150d52fb9b5383555d..23698efa06f3690b44ca1ff31948f615f42e59bf 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -78,7 +78,8 @@ InstallerState::InstallerState()
       root_key_(NULL),
       msi_(false),
       verbose_logging_(false),
-      ensure_google_update_present_(false) {
+      ensure_google_update_present_(false),
+      create_app_launcher_shortcuts_(false) {
 }
 
 InstallerState::InstallerState(Level level)
@@ -90,7 +91,8 @@ InstallerState::InstallerState(Level level)
       root_key_(NULL),
       msi_(false),
       verbose_logging_(false),
-      ensure_google_update_present_(false) {
+      ensure_google_update_present_(false),
+      create_app_launcher_shortcuts_(false) {
   // Use set_level() so that root_key_ is updated properly.
   set_level(level);
 }
@@ -118,12 +120,24 @@ void InstallerState::Initialize(const CommandLine& command_line,
 
   const bool is_uninstall = command_line.HasSwitch(switches::kUninstall);
 
-  if (prefs.install_chrome()) {
-    Product* p = AddProductFromPreferences(
+  // App Launcher and Chrome are unified.

[gab, 2013/04/29 20:25:41]

The Chrome product (i.e. the shortcuts) is always installed when the app
launcher is installed?

[huangs, 2013/04/30 14:01:49]

This is the main premise of the Chrome / App Launcher unification plan; the
stand-alone App Launcher is going away.

+  if (prefs.install_chrome() || prefs.install_chrome_app_launcher()) {
+    Product* p1 = AddProductFromPreferences(
         BrowserDistribution::CHROME_BROWSER, prefs, machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
-            << " distribution: " << p->distribution()->GetAppShortCutName();
+            << " distribution: " << p1->distribution()->GetAppShortCutName();
+
+    if (is_multi_install()) {
+      Product* p2 = AddProductFromPreferences(
+          BrowserDistribution::CHROME_APP_HOST, prefs, machine_state);
+      VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
+              << " distribution: " << p2->distribution()->GetAppShortCutName();
+    }
   }
+  // TODO(huangs): Remove by M29.
+  // Create App Launcher shortcuts if --app-launcher is specified.
+  create_app_launcher_shortcuts_ = prefs.install_chrome_app_launcher();
+
   if (prefs.install_chrome_frame()) {
     Product* p = AddProductFromPreferences(
         BrowserDistribution::CHROME_FRAME, prefs, machine_state);
@@ -131,38 +145,18 @@ void InstallerState::Initialize(const CommandLine& command_line,
             << " distribution: " << p->distribution()->GetAppShortCutName();
   }
 
-  if (prefs.install_chrome_app_launcher()) {
-    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)) {
-      // App Host will happily use Chrome at system level, or binaries at system
-      // level, even if app host is user level.
-      const ProductState* chrome_state = machine_state.GetProductState(
-          true,  // system level
-          BrowserDistribution::CHROME_BROWSER);
-      // If Chrome is at system-level, multi- or otherwise. We'll use it.
-      if (!chrome_state) {
-        const ProductState* binaries_state = machine_state.GetProductState(
-            true,  // system level
-            BrowserDistribution::CHROME_BINARIES);
-        if (!binaries_state)
-          need_binaries = true;
-      }
-    }
-
-    // Chrome/Chrome Frame multi need Binaries at their own level.
+    // Chrome/Chrome Frame/App Launcher multi need Binaries at their own level.
     if (FindProduct(BrowserDistribution::CHROME_BROWSER))
       need_binaries = true;
 
     if (FindProduct(BrowserDistribution::CHROME_FRAME))
       need_binaries = true;
 
+    if (FindProduct(BrowserDistribution::CHROME_APP_HOST))

[gab, 2013/04/29 20:25:41]

Why does CHROME_APP_HOST even still exist if it is unified with CHROME_BROWSER?

[huangs, 2013/04/30 14:01:49]

Because we need to create the Omaha Product / ProductClient key, so 7DA user
tracking will continue to work independently from Chrome.

+      need_binaries = true;
+
     if (need_binaries && !FindProduct(BrowserDistribution::CHROME_BINARIES)) {
       // Force binaries to be installed/updated.
       Product* p = AddProductFromPreferences(