summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/google_chrome_distribution.h
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 17:43:23 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 17:43:23 +0000
commit96ef99c095036ec343f5706ca557767fb1c285e5 (patch)
tree87c48af50fff6337adf1a35a8eda6c0753445245 /chrome/installer/util/google_chrome_distribution.h
parent9c118535d6031180bf1a6148f94ddb0d2de4833c (diff)
downloadchromium_src-96ef99c095036ec343f5706ca557767fb1c285e5.zip
chromium_src-96ef99c095036ec343f5706ca557767fb1c285e5.tar.gz
chromium_src-96ef99c095036ec343f5706ca557767fb1c285e5.tar.bz2
Display proper error message at couple of places during installation.
* If Chrome is used to download and install the same version of Chrome, it should display that the current version is in use. * When Chrome gets updated while it is running, there is no reason to launch Chrome (as it would still be old version), so do not write the launch command to registry. * Remove the case of HIGHER_VERSION_EXISTS as a successful install. Not sure why it was marked as successful install. * Remove the code to remove ChromeExt registry keys as this has already been pushed to the channels that had it in the first place. * Move the code to convert install_status into boolean (1 or 0) in Chromium distribution class. BUG=19459, 25534 TEST= 1) Install Chrome, and keep it running. 2) Try to install the same version again and check the error message in the registry. 3) Try to install a higher version and make launch command doesn't get written to the registry. Review URL: http://codereview.chromium.org/541002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_distribution.h')
-rw-r--r--chrome/installer/util/google_chrome_distribution.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index 7aa265f..7490a05 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -57,9 +57,6 @@ class GoogleChromeDistribution : public BrowserDistribution {
virtual std::wstring GetAppDescription();
- virtual int GetInstallReturnCode(
- installer_util::InstallStatus install_status);
-
virtual std::string GetSafeBrowsingName();
virtual std::wstring GetStateKey();