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

Unified Diff: chrome/installer/util/google_update_settings.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
Index: chrome/installer/util/google_update_settings.cc
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index 45234c274b044b55d0172dc4309429232206c152..5a6f4a201962c003fe368c30c8e30ea9c17e31ea 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -271,11 +271,10 @@ bool GoogleUpdateSettings::SetMetricsId(const std::wstring& metrics_id) {
// EULA consent is only relevant for system-level installs.
bool GoogleUpdateSettings::SetEULAConsent(
const InstallationState& machine_state,
+ BrowserDistribution* dist,
bool consented) {
+ DCHECK(dist);
const DWORD eula_accepted = consented ? 1 : 0;
- // This magical method will return the right instance based on such details as
- // whether or not --chrome-frame is present on the command-line.
- BrowserDistribution* dist = BrowserDistribution::GetDistribution();
std::wstring reg_path = dist->GetStateMediumKey();
bool succeeded = true;
RegKey key;
« no previous file with comments | « chrome/installer/util/google_update_settings.h ('k') | chrome/installer/util/google_update_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698