From 3d933e6c681b2ba4d3234a3d8294c4fefae53d18 Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Thu, 4 Mar 2010 19:59:02 +0000 Subject: Prevent CF from trashing Chrome's registrations when uninstalling. BUG=37329 TEST=No longer attempt to delete Chrome registry keys on CF uninstall. Review URL: http://codereview.chromium.org/667007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40645 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/chrome_frame_distribution.cc | 4 ++++ chrome/installer/util/chrome_frame_distribution.h | 2 ++ 2 files changed, 6 insertions(+) (limited to 'chrome/installer/util') diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc index 2b336fe..a394a3c 100644 --- a/chrome/installer/util/chrome_frame_distribution.cc +++ b/chrome/installer/util/chrome_frame_distribution.cc @@ -96,6 +96,10 @@ std::wstring ChromeFrameDistribution::GetVersionKey() { return key; } +bool ChromeFrameDistribution::CanSetAsDefault() { + return false; +} + void ChromeFrameDistribution::UpdateDiffInstallStatus(bool system_install, bool incremental_install, installer_util::InstallStatus install_status) { HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h index f7bcce3..650c3d2 100644 --- a/chrome/installer/util/chrome_frame_distribution.h +++ b/chrome/installer/util/chrome_frame_distribution.h @@ -43,6 +43,8 @@ class ChromeFrameDistribution : public BrowserDistribution { virtual std::wstring GetVersionKey(); + virtual bool CanSetAsDefault(); + // This is the point at which the Google Chrome installer removes the Google // Update ap value. We implement this simply to have the same behaviour re. // the ap value. -- cgit v1.1