summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/message_center/views/message_center_button_bar.cc4
-rw-r--r--ui/message_center/views/message_center_button_bar.h2
-rw-r--r--ui/resources/ui_resources.grd1
3 files changed, 6 insertions, 1 deletions
diff --git a/ui/message_center/views/message_center_button_bar.cc b/ui/message_center/views/message_center_button_bar.cc
index b6ebd81..149c3ed 100644
--- a/ui/message_center/views/message_center_button_bar.cc
+++ b/ui/message_center/views/message_center_button_bar.cc
@@ -158,7 +158,11 @@ MessageCenterButtonBar::MessageCenterButtonBar(
IDR_NOTIFICATION_CLEAR_ALL_HOVER,
IDR_NOTIFICATION_CLEAR_ALL_PRESSED,
IDS_MESSAGE_CENTER_CLEAR_ALL);
+ close_all_button_->SetImage(
+ views::Button::STATE_DISABLED,
+ resource_bundle.GetImageSkiaNamed(IDR_NOTIFICATION_CLEAR_ALL_DISABLED));
button_container_->AddChildView(close_all_button_);
+
settings_button_ =
new NotificationCenterButton(this,
IDR_NOTIFICATION_SETTINGS,
diff --git a/ui/message_center/views/message_center_button_bar.h b/ui/message_center/views/message_center_button_bar.h
index 950e25e..8190e3e 100644
--- a/ui/message_center/views/message_center_button_bar.h
+++ b/ui/message_center/views/message_center_button_bar.h
@@ -67,7 +67,7 @@ class MessageCenterButtonBar : public views::View,
NotificationCenterButton* title_arrow_;
views::Label* notification_label_;
views::View* button_container_;
- views::Button* close_all_button_;
+ NotificationCenterButton* close_all_button_;
NotificationCenterButton* settings_button_;
NotificationCenterButton* quiet_mode_button_;
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 041a761..2cb91be 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -240,6 +240,7 @@
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_HOVER" file="common/notification_arrow_hover.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_PRESSED" file="common/notification_arrow_pressed.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL" file="common/notification_clear_all.png"/>
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_DISABLED" file="common/notification_clear_all_disabled.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_HOVER" file="common/notification_clear_all_hover.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_PRESSED" file="common/notification_clear_all_pressed.png"/>
<if expr="is_win">