diff options
| author | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 02:53:11 +0000 |
|---|---|---|
| committer | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 02:53:11 +0000 |
| commit | 8bb28168f0e71295a90ec657ed0473233b57be3b (patch) | |
| tree | 68edb1b88f64e9a532e5adacd9a2c0382c52965e /chrome/app | |
| parent | dc301ceece8edf9c13b9989f0b1f49cb37e2393c (diff) | |
| download | chromium_src-8bb28168f0e71295a90ec657ed0473233b57be3b.zip chromium_src-8bb28168f0e71295a90ec657ed0473233b57be3b.tar.gz chromium_src-8bb28168f0e71295a90ec657ed0473233b57be3b.tar.bz2 | |
Reland r246120 "Implements the Synced Notifications Welcome Toast."
> Implements the Synced Notifications Welcome Toast.
>
> The first notification for synced notifications will
> now generate a normal notification explaining the new
> service.
>
> This does not yet implement click-to-disable or have
> proper resources.
Relanded version contains a fix for memory test errors.
TBR=oshima@chromium.org
BUG=315248
Review URL: https://codereview.chromium.org/145023004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 9 | ||||
| -rw-r--r-- | chrome/app/theme/default_100_percent/common/block_notifier.png | bin | 0 -> 262 bytes | |||
| -rw-r--r-- | chrome/app/theme/default_200_percent/common/block_notifier.png | bin | 0 -> 482 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 55f7500..64d4f37 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -13581,6 +13581,15 @@ Some features may be unavailable. Please check that the profile exists and you <ph name="product_name">$1<ex>Chrome</ex></ph> Notifications </message> </if> + <message name="IDS_NOTIFIER_WELCOME_TITLE" desc="Notification title for when a new notifier service is introduced."> + <ph name="service_name">$1<ex>Google+</ex></ph> notifications + </message> + <message name="IDS_NOTIFIER_WELCOME_BODY" desc="Notification body for when a new notifier service is introduced."> + Now on your desktop + </message> + <message name="IDS_NOTIFIER_WELCOME_BUTTON" desc="Notification body for when a new notifier service is introduced."> + Turn off these notifications + </message> <!-- Mac AppleScript --> <if expr="is_macosx"> diff --git a/chrome/app/theme/default_100_percent/common/block_notifier.png b/chrome/app/theme/default_100_percent/common/block_notifier.png Binary files differnew file mode 100644 index 0000000..f8c66fa --- /dev/null +++ b/chrome/app/theme/default_100_percent/common/block_notifier.png diff --git a/chrome/app/theme/default_200_percent/common/block_notifier.png b/chrome/app/theme/default_200_percent/common/block_notifier.png Binary files differnew file mode 100644 index 0000000..2813f1b --- /dev/null +++ b/chrome/app/theme/default_200_percent/common/block_notifier.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 1cb4b4b..598c75af 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -501,6 +501,7 @@ </if> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_ICON" file="common/notification_welcome_icon.png" /> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_LEARN_MORE" file="common/notification_welcome_learn_more.png" /> + <structure type="chrome_scaled_image" name="IDR_NOTIFIER_BLOCK_BUTTON" file="common/block_notifier.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_AND_SHADOW_BOTTOM" file="common/omnibox_border_and_shadow_bottom.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_AND_SHADOW_BOTTOM_LEFT" file="common/omnibox_border_and_shadow_bottom_left.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_AND_SHADOW_BOTTOM_RIGHT" file="common/omnibox_border_and_shadow_bottom_right.png" /> |
