diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 14:20:26 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 14:20:26 +0000 |
| commit | e1501cb8728a4787b0d2b2b18ad8804ddc983534 (patch) | |
| tree | 154ea96e32b09b89d401b0f2c607b738dfd6ae32 /chrome/app | |
| parent | e22cb252381dc82d95e02b4f2d214ec5e79b0ec7 (diff) | |
| download | chromium_src-e1501cb8728a4787b0d2b2b18ad8804ddc983534.zip chromium_src-e1501cb8728a4787b0d2b2b18ad8804ddc983534.tar.gz chromium_src-e1501cb8728a4787b0d2b2b18ad8804ddc983534.tar.bz2 | |
Implement installation of the Chrome App Host.
The Chrome App Host is a simple exe that delegates to a Chrome Binaries installation at user or system level. If no installation is available, it will trigger an installation.
The Chrome App Host prevents the Chrome Binaries from being uninstalled, except in the case of an upgrade to system-level.
The Chrome App Host is implemented in this uncommitted CL: http://codereview.chromium.org/10559090/ .
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10665002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 9 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index da5ccf8..0d815a6 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -223,6 +223,12 @@ be available for now. --> <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name"> Chromium Frame </message> + <message name="IDS_PRODUCT_APP_HOST_NAME" desc="The Chrome App Host application name"> + Chromium App Host + </message> + <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name"> + Chromium Binaries + </message> <message name="IDS_VERSIONMISMATCH_HEADER"> Chromium Frame Update. </message> @@ -446,6 +452,9 @@ Chromium is unable to recover your settings. <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when higher version already exists."> This computer already has a more recent version of Chromium. If the software is not working, please uninstall Chromium and try again. </message> + <message name="IDS_INSTALL_HIGHER_VERSION_APP_HOST" desc="Error displayed when higher version of the Chromium App Host already exists."> + This computer already has a more recent version of the Chromium components. Please use a more recent installer. + </message> <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when higher version already exists."> This computer already has a more recent version of Chromium Frame. If the software is not working, please uninstall Chromium Frame and try again. </message> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 92f0585..3b8f7ab 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -146,6 +146,12 @@ Chrome supports. --> <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name"> Google Chrome Frame </message> + <message name="IDS_PRODUCT_APP_HOST_NAME" desc="The Chrome App Host application name"> + Google Chrome App Host + </message> + <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name"> + Google Chrome Binaries + </message> <message name="IDS_VERSIONMISMATCH_HEADER"> Chrome Frame Update. </message> @@ -369,6 +375,9 @@ Google Chrome is unable to recover your settings. <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when higher version already exists."> This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and try again. </message> + <message name="IDS_INSTALL_HIGHER_VERSION_APP_HOST" desc="Error displayed when higher version of the Chrome App Host already exists."> + This computer already has a more recent version of the Google Chrome components. Please use a more recent installer. + </message> <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when higher version of Chrome Frame already exists"> This computer already has a more recent version of Google Chrome Frame. If the software is not working, please uninstall Google Chrome Frame and try again. </message> |