Do not show the EULA if it has already been accepted by the user in another user data dir.

chrome/browser/first_run/first_run_win.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/browser/first_run/first_run.h"
 
 #include <shlobj.h>
 #include <windows.h>
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
+#include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/first_run/first_run_import_observer.h"
 #include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/importer_progress_dialog.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/worker_thread_ticker.h"
 #include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "google_update/google_update_idl.h"
 #include "grit/chromium_strings.h"
@@ skipping 116 matching lines @@
 
   // TODO(evan): should this use options.wait = true?
   if (!base::LaunchProcess(cl, base::LaunchOptions(), &ph))
     return false;
   DWORD wr = ::WaitForSingleObject(ph, INFINITE);
   if (wr != WAIT_OBJECT_0)
     return false;
   return (TRUE == ::GetExitCodeProcess(ph, reinterpret_cast<DWORD*>(ret_code)));
 }
 
+// The EULA is considered to have not yet been accepted if both of the following
+// are true:
+//  1) ClientState\<guid>\eulaaccepted is present and has a value of 0
+//  AND
+//  2) ClientStateMedium\<guid>\eulaaccepted is not present OR is present
+//     and has a value of 0.
+bool IsEulaNotAccepted() {
+  BrowserDistribution* dist =  BrowserDistribution::GetDistribution();

[robertshield, 2012/06/14 02:50:06]

nit: double spaces

[grt (UTC plus 2), 2012/06/14 03:39:00]

Done.

+  DWORD eula_accepted = 1;
+  base::win::RegKey reg_key;
+  if ((reg_key.Open(HKEY_LOCAL_MACHINE, dist->GetStateKey().c_str(),
+                    KEY_QUERY_VALUE) == ERROR_SUCCESS) &&
+      (reg_key.ReadValueDW(google_update::kRegEULAAceptedField,
+                           &eula_accepted) == ERROR_SUCCESS) &&
+      (eula_accepted == 0)) {
+    // Google Update says that the EULA has not been accepted.  Check that
+    // Chrome hasn't written its acceptance value into ClientStateMedium.
+    if (reg_key.Open(HKEY_LOCAL_MACHINE, dist->GetStateMediumKey().c_str(),
+                     KEY_QUERY_VALUE) == ERROR_SUCCESS) {
+      reg_key.ReadValueDW(google_update::kRegEULAAceptedField, &eula_accepted);
+    }
+  }
+  return eula_accepted == 0;
+}
+
 // Writes the EULA to a temporary file, returned in |*eula_path|, and returns
 // true if successful.
 bool WriteEULAtoTempFile(FilePath* eula_path) {
   base::StringPiece terms =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_TERMS_HTML, ui::SCALE_FACTOR_NONE);
   if (terms.empty())
     return false;
   FILE *file = file_util::CreateAndOpenTemporaryFile(eula_path);
   if (!file)
     return false;
   bool good = fwrite(terms.data(), terms.size(), 1, file) == 1;
   fclose(file);
   return good;
 }
 
 void ShowPostInstallEULAIfNeeded(installer::MasterPreferences* install_prefs) {
   bool value = false;
   if (install_prefs->GetBool(installer::master_preferences::kRequireEula,

[grt (UTC plus 2), 2012/06/14 02:09:52]

i'm tempted to get rid of this check for require_eula.  on the other hand, i
want to avoid a regression.  whaddya think, robert?

[robertshield, 2012/06/14 02:50:06]

If require_eula is not present and the eulaaccepted is 0 then Chrome will run
but never update, right? If that's correct we should drop the check since any
case where Chrome never updates is double plus bad.

No likely regressions are coming to mind, though that means little :s

[grt (UTC plus 2), 2012/06/14 03:39:00]

Done.

-          &value) && value) {
+                             &value) && value && IsEulaNotAccepted()) {
     // Show the post-installation EULA. This is done by setup.exe and the
     // result determines if we continue or not. We wait here until the user
     // dismisses the dialog.
 
     // The actual eula text is in a resource in chrome. We extract it to
     // a text file so setup.exe can use it as an inner frame.
     FilePath inner_html;
     if (WriteEULAtoTempFile(&inner_html)) {
       int retcode = 0;
       if (!LaunchSetupWithParam(installer::switches::kShowEula,
@@ skipping 382 matching lines @@
     return false;
 
   internal::SetShowWelcomePagePrefIfNeeded(install_prefs.get());
   internal::SetImportPreferencesAndLaunchImport(out_prefs, install_prefs.get());
   internal::SetDefaultBrowser(install_prefs.get());
 
   return false;
 }
 
 }  // namespace first_run