summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 10:29:47 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 10:29:47 +0000
commit8101ef03ff6f84be3dd58dfb47760396553b09ba (patch)
tree2e722e118233bbf59b933eed4a33e9fe30ddecfb /chrome/app
parent62f6bbd3fa77c1f9a42f8cbb6081ccd111217217 (diff)
downloadchromium_src-8101ef03ff6f84be3dd58dfb47760396553b09ba.zip
chromium_src-8101ef03ff6f84be3dd58dfb47760396553b09ba.tar.gz
chromium_src-8101ef03ff6f84be3dd58dfb47760396553b09ba.tar.bz2
Augment the About box flow to automatically install any new version we find on the server and have inline buttons to suggest restart, which restores your session (as opposed to the modal dialog box suggesting a restart and not restarting/restoring).
BUG=http://crbug.com/43076, http://crbug.com/1821 TEST=Needs manual testing with an active Google Update server. Review URL: http://codereview.chromium.org/3076018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b217207..ae64e12 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4668,6 +4668,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_UPGRADE_SUCCESSFUL_NOVERSION" desc="Status label: Successfully upgraded">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> has been updated
</message>
+ <message name="IDS_UPGRADE_SUCCESSFUL_RESTART" desc="Status label: Successfully updated">
+ Restart <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to finish updating to <ph name="VERSION">$2<ex>0.1.131</ex></ph>
+ </message>
+ <message name="IDS_UPGRADE_SUCCESSFUL_NOVERSION_RESTART" desc="Status label: Successfully updated">
+ Restart <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to finish updating
+ </message>
<if expr="pp_ifdef('chromeos')">
<message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is up to date