Implementing app command to query EULA acceptance state for Chrome.

chrome/installer/setup/install_worker.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.
 //
 // This file contains the definitions of the installer functions that build
 // the WorkItemList used to install the application.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <oaidl.h>
@@ skipping 194 matching lines @@
                                         archive_dst.value(),
                                         temp_path.value(),
                                         WorkItem::ALWAYS);
 #endif  // COMPONENT_BUILD
     }
   }
 }
 
 void AddInstallAppCommandWorkItems(const InstallerState& installer_state,
                                    const InstallationState& machine_state,
-                                   const FilePath& setup_path,
                                    const Version& new_version,
                                    const Product& product,
                                    WorkItemList* work_item_list) {
   DCHECK(product.is_chrome_app_host());
 
   string16 cmd_key(product.distribution()->GetVersionKey());
   cmd_key.append(1, L'\\').append(google_update::kRegCommandsKey)
       .append(1, L'\\').append(kCmdInstallApp);
 
   if (installer_state.operation() == InstallerState::UNINSTALL) {
@@ skipping 20 matching lines @@
   const Products& products = installer_state.products();
   for (Products::const_iterator it = products.begin(); it < products.end();
        ++it) {
     const Product& p = **it;
     if (p.is_chrome_frame()) {
       AddChromeFrameWorkItems(original_state, installer_state, setup_path,
                               new_version, p, list);
     }
     if (p.is_chrome_app_host()) {
       AddInstallAppCommandWorkItems(installer_state, original_state,
-                                    setup_path, new_version, p, list);
+                                    new_version, p, list);
     }
     if (p.is_chrome()) {
       AddOsUpgradeWorkItems(installer_state, setup_path, new_version, p,
                             list);
     }
+    if (p.is_chrome_binaries()) {
+      AddQueryEULAAcceptanceWorkItems(installer_state, setup_path, new_version,
+                                      p, list);
+    }
   }
 }
 
 // This is called when an MSI installation is run. It may be that a user is
 // attempting to install the MSI on top of a non-MSI managed installation.
 // If so, try and remove any existing uninstallation shortcuts, as we want the
 // uninstall to be managed entirely by the MSI machinery (accessible via the
 // Add/Remove programs dialog).
 void AddDeleteUninstallShortcutsForMSIWorkItems(
     const InstallerState& installer_state,
@@ skipping 1358 matching lines @@
       cmd_line.AppendSwitch(installer::switches::kSystemLevel);
     // Log everything for now.
     cmd_line.AppendSwitch(installer::switches::kVerboseLogging);
 
     AppCommand cmd(cmd_line.GetCommandLineString());
     cmd.set_is_auto_run_on_os_upgrade(true);
     cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list);
   }
 }
 
+void AddQueryEULAAcceptanceWorkItems(const InstallerState& installer_state,
+                                     const FilePath& setup_path,
+                                     const Version& new_version,
+                                     const Product& product,
+                                     WorkItemList* work_item_list) {
+  const HKEY root_key = installer_state.root_key();
+  string16 cmd_key(product.distribution()->GetVersionKey());
+  cmd_key.append(1, FilePath::kSeparators[0])
+      .append(google_update::kRegCommandsKey)
+      .append(1, FilePath::kSeparators[0])
+      .append(kCmdQueryEULAAcceptance);
+  if (installer_state.operation() == InstallerState::UNINSTALL) {
+    work_item_list->AddDeleteRegKeyWorkItem(root_key, cmd_key)->
+        set_log_message("Removing query EULA acceptance command");
+  } else {
+    CommandLine cmd_line(installer_state
+        .GetInstallerDirectory(new_version)
+        .Append(setup_path.BaseName()));
+    cmd_line.AppendSwitch(switches::kQueryEULAAcceptance);

[grt (UTC plus 2), 2013/01/24 21:04:55]

does it make sense to add --system-level if it's a system-level install so that
the query only checks at the level of the installed binaries? i feel vaguely
uncomfortable with the current code which tries to check both.

also, consider adding kVerboseLogging if installer_state.verbose_logging().

[huangs, 2013/01/25 01:13:23]

Ah, right.  Done.

+    AppCommand cmd(cmd_line.GetCommandLineString());
+    cmd.set_is_web_accessible(true);
+    cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list);
+  }
+}
+
 }  // namespace installer