diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 15:46:00 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 15:46:00 +0000 |
commit | 24febe4c9cfbe342eee075f33aa7c99652e99582 (patch) | |
tree | fee6956add1cd69c002e1dab44b2634d5c4e4373 /chrome/browser/first_run | |
parent | 3ef6c425c3da43d3dd2137f3a7fbf1a0307a40e2 (diff) | |
download | chromium_src-24febe4c9cfbe342eee075f33aa7c99652e99582.zip chromium_src-24febe4c9cfbe342eee075f33aa7c99652e99582.tar.gz chromium_src-24febe4c9cfbe342eee075f33aa7c99652e99582.tar.bz2 |
Prevent users from bypassing the EULA shown on first run by killing setup.exe.
BUG=88542
TEST=NONE
Review URL: http://codereview.chromium.org/7250013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
-rw-r--r-- | chrome/browser/first_run/first_run.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 51dd756..d244007 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -137,7 +137,8 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, int retcode = 0; if (!LaunchSetupWithParam(installer::switches::kShowEula, inner_html.value(), &retcode) || - (retcode == installer::EULA_REJECTED)) { + (retcode != installer::EULA_ACCEPTED && + retcode != installer::EULA_ACCEPTED_OPT_IN)) { LOG(WARNING) << "EULA rejected. Fast exit."; ::ExitProcess(1); } |