diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 19:51:09 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 19:51:09 +0000 |
| commit | 668c4dc439608868b530afe0f9a7592ee32854d6 (patch) | |
| tree | b54101bf8342d33a0f3423a22a80a61651994ce5 /chrome/app | |
| parent | c8982d7853930dbad9bf177bf78e7606e063cfae (diff) | |
| download | chromium_src-668c4dc439608868b530afe0f9a7592ee32854d6.zip chromium_src-668c4dc439608868b530afe0f9a7592ee32854d6.tar.gz chromium_src-668c4dc439608868b530afe0f9a7592ee32854d6.tar.bz2 | |
Return a new error code multi-install updates if Group Policy settings blocking updates for individual products are conflicting with the effective update policy for the multi-install binaries.
In so doing, I moved the GP update policy checking code that was in browser into installer_util.
BUG=none
TEST=Install multi-install Chrome version N-1, disable updates for Chrome, then try to update to version N. With luck, you'll find that the update failed on account of inconsistent GP settings.
R=robertshield@chromium.org,pastarmovj@chromium.org,gwilson@chromium.org
Review URL: http://codereview.chromium.org/7111012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 2 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 6e2d1a4..0276a1b 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -467,6 +467,8 @@ be available for now. --> <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome."> Invalid arguments. Chromium Frame cannot be installed in ready mode without also installing Chromium. </message> + <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="This message does not apply to Chromium."> + </message> <!-- Options Dialog --> <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience."> Chromium may use web services to improve your browsing experience. diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 801f995..2cbbc75 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -458,6 +458,9 @@ Chrome supports. --> <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome."> Invalid arguments. Google Chrome Frame cannot be installed in ready mode without also installing Google Chrome. </message> + <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="Error during install if the update policies settings in Group Policy are inconsistent."> + Google Chrome or Google Chrome Frame cannot be updated on account of inconsistent Google Update Group Policy settings. Use the Group Policy Editor to set the update policy override for the Google Chrome Binaries application and try again. + </message> <!-- Options Dialog --> <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience."> Google Chrome may use web services to improve your browsing experience. |