diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 22:06:10 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 22:06:10 +0000 |
| commit | 82a1cc9ed2a25e8ee549e057d0d1720cc1ce0eb4 (patch) | |
| tree | 97326638bcf1c22d612b62b5f451fb9ce0e52239 /ash/ash_strings.grd | |
| parent | 589c88ea046766f8f0f745d40a2eef2523cd7fe2 (diff) | |
| download | chromium_src-82a1cc9ed2a25e8ee549e057d0d1720cc1ce0eb4.zip chromium_src-82a1cc9ed2a25e8ee549e057d0d1720cc1ce0eb4.tar.gz chromium_src-82a1cc9ed2a25e8ee549e057d0d1720cc1ce0eb4.tar.bz2 | |
Add WebNotificationTray to the status area
This CL:
* Adds WebNotificationTray and its Delegate class for handling web/app notifications in the status area
* Adds hooks to SystemTray so that StatusAreaWidget can hide system notifications when web notifications are viewed
BUG=124914
TEST=WebNotificationTrayTest unittest passes, system tray functionality is unchanged, web notification tray works in ash_shell.
Review URL: https://chromiumcodereview.appspot.com/10546125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_strings.grd')
| -rw-r--r-- | ash/ash_strings.grd | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index e28fbbf..702edbf 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd @@ -393,6 +393,18 @@ Press Search key to cancel. <message name="IDS_ASH_STATUS_TRAY_PREVIOUS_MENU" desc="The accessible text for header entries for detailed versions of status tray items."> Previous menu </message> + <message name="IDS_ASH_WEB_NOTFICATION_TRAY_EXTENSIONS_DISABLE" desc="The menu entry for disabling extensions from a notification."> + Disable extension + </message> + <message name="IDS_ASH_WEB_NOTFICATION_TRAY_SITE_DISABLE" desc="The menu entry for disabling notification from a site."> + Disable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph> + </message> + <message name="IDS_ASH_WEB_NOTFICATION_TRAY_SETTINGS" desc="The menu entry or button for visiting the appropriate settings page."> + Settings... + </message> + <message name="IDS_ASH_WEB_NOTFICATION_TRAY_CLOSE_ALL" desc="The button for closing all notifications."> + Close All + </message> </messages> </release> </grit> |