diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 18:40:11 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 18:40:11 +0000 |
| commit | b2bcbfe9e2eb8f9f855b52eb48fcf0685a81fbe4 (patch) | |
| tree | 1ba47530882df1b894eec92ef7a4fa572a3539d5 /chrome/app | |
| parent | b550a3dcd79d555c1b7f1049e56b558b377a61c7 (diff) | |
| download | chromium_src-b2bcbfe9e2eb8f9f855b52eb48fcf0685a81fbe4.zip chromium_src-b2bcbfe9e2eb8f9f855b52eb48fcf0685a81fbe4.tar.gz chromium_src-b2bcbfe9e2eb8f9f855b52eb48fcf0685a81fbe4.tar.bz2 | |
Revert 80128 - apps: Notify the user if an app's background page crashes.
Add a new notification for when an app's background page crashes, and use this
notification message to show a message to the user and allow to restart the app.
Extension-crashes also create balloon notifications instead of infobars.
BUG=none
TEST=existing ExtensionCrashRecoveryTest.* tests.
Review URL: http://codereview.chromium.org/6731038
TBR=sadrul@chromium.org
Review URL: http://codereview.chromium.org/6788018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e976280..3361c2b 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -217,12 +217,6 @@ Other platform defines such as use_titlecase are declared in build/common.gypi. <message name="IDS_BACKGROUND_APP_INSTALLED_BALLOON_BODY" desc="The contents of the balloon that is displayed when a background app is installed"> <ph name="APP_NAME">$1<ex>Background App</ex></ph> will launch at system startup and continue to run in the background even once you've closed all other <ph name="PRODUCT_NAME">$2<ex>Google Chrome</ex></ph> windows. </message> - <message name="IDS_BACKGROUND_CRASHED_APP_BALLOON_MESSAGE" desc="The contents of the balloon that is displayed when a background app crashes"> - <ph name="APP_NAME">$1<ex>Background App</ex></ph> has crashed. Click on this balloon to restart the app. - </message> - <message name="IDS_BACKGROUND_CRASHED_EXTENSION_BALLOON_MESSAGE" desc="The contents of the balloon that is displayed when an extension crashes"> - <ph name="APP_NAME">$1<ex>Extension</ex></ph> has crashed. Click on this balloon to reload the extension. - </message> <message name="IDS_SHOWFULLHISTORY_LINK" desc="The label of the Show Full History link at the bottom of the back/forward menu."> Show Full History @@ -3516,6 +3510,14 @@ Other platform defines such as use_titlecase are declared in build/common.gypi. Notification: <ph name="NOTIFICATION_NAME">$1<ex>http://www.domain.com</ex></ph> </message> + <!-- Extension Crashed Info Bar--> + <message name="IDS_EXTENSION_CRASHED_INFOBAR_RELOAD_BUTTON" desc="Title of the reload button in the extension crashed infobar. After the button is clicked, the extension will be reloaded."> + Reload + </message> + <message name="IDS_EXTENSION_CRASHED_INFOBAR_MESSAGE" desc="Message displayed on the extension crashed infobar."> + The following extension has crashed: <ph name="EXTENSION_NAME">$1<ex>Buildbot Monitor</ex></ph> + </message> + <!-- Theme preview info bar --> <message name="IDS_THEME_INSTALL_INFOBAR_LABEL" desc="Text displayed on an infobar when a theme has been installed."> Installed theme "<ph name="THEME_NAME">$1<ex>Snowflake Theme</ex></ph>" |