Update Mac notification tray behavior.

Now there are 8 icon resources instead of 2.  We will display different
icons based on 3 binary attributes:
* unread notifications
* do not disturb mode
* pressed status (message center open/closed)
The icon is now a bell (instead of a chat bubble), and we will no longer
display unread count with the notification tray icon.

Additionally, this patch causes the icon not to be updated while the
message center is open, and causes the icon not to be removed after the
first notification comes in (to make settings more accessible.)

BUG=264798,264971

Review URL: https://chromiumcodereview.appspot.com/21308002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214932 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 2 deletions

diff --git a/ui/resources/default_100_percent/mac/tray_icon_pressed.png b/ui/resources/default_100_percent/mac/tray_icon_pressed.png
deleted file mode 100644
index 02cb8b3..0000000
--- a/ui/resources/default_100_percent/mac/tray_icon_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/mac/tray_icon_regular.png b/ui/resources/default_100_percent/mac/tray_icon_regular.png
deleted file mode 100644
index 7ed4140..0000000
--- a/ui/resources/default_100_percent/mac/tray_icon_regular.png
+++ /dev/null
diff --git a/ui/resources/default_200_percent/mac/tray_icon_pressed.png b/ui/resources/default_200_percent/mac/tray_icon_pressed.png
deleted file mode 100644
index 59e063c..0000000
--- a/ui/resources/default_200_percent/mac/tray_icon_pressed.png
+++ /dev/null
diff --git a/ui/resources/default_200_percent/mac/tray_icon_regular.png b/ui/resources/default_200_percent/mac/tray_icon_regular.png
deleted file mode 100644
index ac2e4f1..0000000
--- a/ui/resources/default_200_percent/mac/tray_icon_regular.png
+++ /dev/null
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index fbbb9fe..1aeb4d1 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -338,8 +338,14 @@
       <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_RIGHT" file="common/textbutton_pressed_top_right.png" />
       <structure type="chrome_scaled_image" name="IDR_THROBBER" file="throbber.png" />
       <if expr="is_macosx">
-        <structure type="chrome_scaled_image" name="IDR_TRAY_ICON_PRESSED" file="mac/tray_icon_pressed.png"/>
-        <structure type="chrome_scaled_image" name="IDR_TRAY_ICON_REGULAR" file="mac/tray_icon_regular.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_ATTENTION" file="mac/notification_tray_attention.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_ATTENTION_PRESSED" file="mac/notification_tray_attention_pressed.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_DO_NOT_DISTURB_ATTENTION" file="mac/notification_tray_do_not_disturb_attention.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_DO_NOT_DISTURB_ATTENTION_PRESSED" file="mac/notification_tray_do_not_disturb_attention_pressed.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_DO_NOT_DISTURB_EMPTY" file="mac/notification_tray_do_not_disturb_empty.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_DO_NOT_DISTURB_EMPTY_PRESSED" file="mac/notification_tray_do_not_disturb_empty_pressed.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_EMPTY" file="mac/notification_tray_empty.png"/>
+        <structure type="chrome_scaled_image" name="IDR_TRAY_EMPTY_PRESSED" file="mac/notification_tray_empty_pressed.png"/>
       </if>
       <structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_CENTER" file="common/window_bottom_center.png" />
       <structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="common/window_bottom_left_corner.png" />