Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: chrome/installer/setup/setup_main.cc

Issue 7309008: Change the system-level EULA dialog to not use GET parameters with res:// urls. Instead use the d... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/eula/oem.js ('k') | chrome/installer/util/html_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_main.cc
===================================================================
--- chrome/installer/setup/setup_main.cc (revision 91469)
+++ chrome/installer/setup/setup_main.cc (working copy)
@@ -674,17 +674,18 @@
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);
@@ -824,11 +825,7 @@
}
// 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";
« no previous file with comments | « chrome/installer/setup/eula/oem.js ('k') | chrome/installer/util/html_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698