diff options
author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 19:20:18 +0000 |
---|---|---|
committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 19:20:18 +0000 |
commit | 57618d827ba3d4d618b78518f538c4c613bbd906 (patch) | |
tree | 1d3a2608076bdfacadd1f0c13836e3d7be350e28 /chrome/installer/util/helper.h | |
parent | 253274b4e2ffeea590480f461c6a0bdbfa5e4369 (diff) | |
download | chromium_src-57618d827ba3d4d618b78518f538c4c613bbd906.zip chromium_src-57618d827ba3d4d618b78518f538c4c613bbd906.tar.gz chromium_src-57618d827ba3d4d618b78518f538c4c613bbd906.tar.bz2 |
Do machine inspection on install.
When installing Chrome [x]or Chrome Frame in multi mode, check if the other product (CF xor Chrome) is installed.
If it is, also include it in the installation as we need to update both products in sync.
For Chrome Frame, I also added checks to see if CEEE is already enabled or if the user has already opted into GCF.
If CEEE has been enabled, we implicitly include it when the install is run even though ceee is not on the command line.
If ready-mode is set on the command line but Chrome Frame is already installed without it, we won't enable ready mode.
TEST=Try installing Chrome Frame in multi mode. Then install a more recent version of Chrome in multi mode. Both product should be updated. Secondly, for Chrome Frame, install it first and then try to run the installer again, but with ready-mode ont the command line. Chrome Frame should not be switched to ready mode.
BUG=61609
Review URL: http://codereview.chromium.org/6091008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/helper.h')
-rw-r--r-- | chrome/installer/util/helper.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/installer/util/helper.h b/chrome/installer/util/helper.h index 3845806..e5f19ae 100644 --- a/chrome/installer/util/helper.h +++ b/chrome/installer/util/helper.h @@ -9,6 +9,7 @@ #pragma once class BrowserDistribution; +class CommandLine; class FilePath; namespace installer { @@ -16,6 +17,14 @@ namespace installer { // Checks if a distribution is currently installed as part of a multi-install. bool IsInstalledAsMulti(bool system_install, BrowserDistribution* dist); +// Retrieves the command line switches for uninstalling the distribution. +// Note that the returned CommandLine object does not include a "program". +// Only the switches should be used. +// Returns true if the product is installed and the uninstall switches +// were successfully retrieved, otherwise false. +bool GetUninstallSwitches(bool system_install, BrowserDistribution* dist, + CommandLine* cmd_line_switches); + // This function returns the install path for Chrome depending on whether its // system wide install or user specific install. // system_install: if true, the function returns system wide location |