summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/google_chrome_distribution.cc
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 01:44:52 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 01:44:52 +0000
commitbe974f0b77ba65b8b5cad47a7494ef141dcafbb1 (patch)
tree3417e6774fc374899974a3f2b552ecc525981185 /chrome/installer/util/google_chrome_distribution.cc
parent7c2a99cf6d513e227e53c6310522e6afee8966f2 (diff)
downloadchromium_src-be974f0b77ba65b8b5cad47a7494ef141dcafbb1.zip
chromium_src-be974f0b77ba65b8b5cad47a7494ef141dcafbb1.tar.gz
chromium_src-be974f0b77ba65b8b5cad47a7494ef141dcafbb1.tar.bz2
Overinstall mismatch, Launch the existing chrome instead
- If the user has a system-level chrome and it is trying to install user level, instead of having omaha show an error, the existing system level install is launched with --first-run - Disable toast experiment BUG=37410 TEST=see bug Review URL: http://codereview.chromium.org/668114 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_distribution.cc')
-rw-r--r--chrome/installer/util/google_chrome_distribution.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 0b9c604..c977f5b 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -513,7 +513,8 @@ void GoogleChromeDistribution::LaunchUserExperiment(
// Check browser usage inactivity by the age of the last-write time of the
// chrome user data directory.
std::wstring user_data_dir = installer::GetChromeUserDataPath();
- const int kThirtyDays = 30 * 24;
+ // TODO(cpu): re-enable experiment.
+ const int kThirtyDays = 3000 * 24;
int dir_age_hours = GetDirectoryWriteAgeInHours(user_data_dir.c_str());
if (dir_age_hours < 0) {
// This means that we failed to find the user data dir. The most likey