diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 06:33:29 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 06:33:29 +0000 |
| commit | 2c4fb7ba69d1a8f2cf291d6f5588d8e2a8a9b396 (patch) | |
| tree | 9810dac66c8452d4ac76175a4e23b41ab2f5b30d /chrome/app | |
| parent | fc10e87033b603454c0893360182d64547f62441 (diff) | |
| download | chromium_src-2c4fb7ba69d1a8f2cf291d6f5588d8e2a8a9b396.zip chromium_src-2c4fb7ba69d1a8f2cf291d6f5588d8e2a8a9b396.tar.gz chromium_src-2c4fb7ba69d1a8f2cf291d6f5588d8e2a8a9b396.tar.bz2 | |
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=78167,78126
TEST=existing ExtensionCrashRecoveryTest.* tests.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=80128
Review URL: http://codereview.chromium.org/6731038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 3361c2b..e976280 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -217,6 +217,12 @@ 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 @@ -3510,14 +3516,6 @@ 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>" |