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

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

Issue 7600023: Proper EULA handling for quick-enable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 4 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/chrome_frame_quick_enable.cc ('k') | chrome/installer/util/google_update_settings.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
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index e180b427ed1a7d141aee59b3c0d389147a759f4b..b856d5d40dc775d0ad01fb9820ec0a5be84d9592 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -891,8 +891,10 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
std::wstring inner_frame =
cmd_line.GetSwitchValueNative(installer::switches::kShowEula);
*exit_code = ShowEULADialog(inner_frame);
- if (installer::EULA_REJECTED != *exit_code)
- GoogleUpdateSettings::SetEULAConsent(original_state, true);
+ if (installer::EULA_REJECTED != *exit_code) {
+ GoogleUpdateSettings::SetEULAConsent(
+ original_state, BrowserDistribution::GetDistribution(), true);
+ }
} else if (cmd_line.HasSwitch(
installer::switches::kRegisterChromeBrowser)) {
installer::InstallStatus status = installer::UNKNOWN_STATUS;
« no previous file with comments | « chrome/installer/setup/chrome_frame_quick_enable.cc ('k') | chrome/installer/util/google_update_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698