Change the system-level EULA dialog to not use GET parameters with res:// urls. Instead use the d...

chrome/installer/setup/setup_main.cc

 // Copyright (c) 2011 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 <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <string>
@@ skipping 656 matching lines @@
 
         installer_state.UpdateStage(installer::FINISHING);
 
         // Only do Chrome-specific stuff (like launching the browser) if
         // Chrome was specifically requested (rather than being upgraded as
         // part of a multi-install).
         const Product* chrome_install = prefs.install_chrome() ?
             installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER) :
             NULL;
 
-        bool value = false;
+        bool do_not_register_for_update_launch = false;
         if (chrome_install) {
           prefs.GetBool(
               installer::master_preferences::kDoNotRegisterForUpdateLaunch,
-              &value);
+              &do_not_register_for_update_launch);
         } else {
-          value = true;  // Never register.
+          do_not_register_for_update_launch = true;  // Never register.
         }
 
-        bool write_chrome_launch_string = (!value) &&
-            (install_status != installer::IN_USE_UPDATED);
+        bool write_chrome_launch_string =
+            (!do_not_register_for_update_launch &&
+             install_status != installer::IN_USE_UPDATED);
 
         installer_state.WriteInstallerResult(install_status, install_msg_base,
             write_chrome_launch_string ? &chrome_exe : NULL);
 
         if (install_status == installer::FIRST_INSTALL_SUCCESS) {
           VLOG(1) << "First install successful.";
           if (chrome_install) {
             // We never want to launch Chrome in system level install mode.
             bool do_not_launch_chrome = false;
             prefs.GetBool(
@@ skipping 119 matching lines @@
 
 installer::InstallStatus ShowEULADialog(const std::wstring& inner_frame) {
   VLOG(1) << "About to show EULA";
   std::wstring eula_path = installer::GetLocalizedEulaResource();
   if (eula_path.empty()) {
     LOG(ERROR) << "No EULA path available";
     return installer::EULA_REJECTED;
   }
   // Newer versions of the caller pass an inner frame parameter that must
   // be given to the html page being launched.
-  if (!inner_frame.empty()) {
-    eula_path += L"?innerframe=";
-    eula_path += inner_frame;
-  }
-  installer::EulaHTMLDialog dlg(eula_path);
+  installer::EulaHTMLDialog dlg(eula_path, inner_frame);
   installer::EulaHTMLDialog::Outcome outcome = dlg.ShowModal();
   if (installer::EulaHTMLDialog::REJECTED == outcome) {
     LOG(ERROR) << "EULA rejected or EULA failure";
     return installer::EULA_REJECTED;
   }
   if (installer::EulaHTMLDialog::ACCEPTED_OPT_IN == outcome) {
     VLOG(1) << "EULA accepted (opt-in)";
     return installer::EULA_ACCEPTED_OPT_IN;
   }
   VLOG(1) << "EULA accepted (no opt-in)";
@@ skipping 467 matching lines @@
   if (!(installer_state.is_msi() && is_uninstall))
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }