Replace Ash web notification tray view with a button.

ash/system/web_notification/web_notification_tray.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace {
 
 // Tray constants
 const int kTrayContainerVeritcalPaddingBottomAlignment = 3;
 const int kTrayContainerHorizontalPaddingBottomAlignment = 1;
 const int kTrayContainerVerticalPaddingVerticalAlignment = 1;
 const int kTrayContainerHorizontalPaddingVerticalAlignment = 0;
 const int kPaddingFromLeftEdgeOfSystemTrayBottomAlignment = 8;
 const int kPaddingFromTopEdgeOfSystemTrayVerticalAlignment = 10;
-const int kTrayWidth = 40;
-const int kTrayHeight = 31;
-const int kTraySideWidth = 32;
-const int kTraySideHeight = 24;
 
 // Web Notification Bubble constants
 const int kWebNotificationBubbleMinHeight = 80;
 const int kWebNotificationBubbleMaxHeight = 400;
 // Delay laying out the Bubble until all notifications have been added and icons
 // have had a chance to load.
 const int kUpdateDelayMs = 50;
 const int kAutocloseDelaySeconds = 5;
 const SkColor kMessageCountColor = SkColorSetARGB(0xff, 0xff, 0xff, 0xff);
 const SkColor kNotificationColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
@@ skipping 52 matching lines @@
 
   WebNotificationList()
       : message_center_visible_(false),
         unread_count_(0) {
   }
 
   void SetMessageCenterVisible(bool visible) {
     if (message_center_visible_ == visible)
       return;
     message_center_visible_ = visible;
-    if (visible) {
-      // Clear the unread count when the list is shown.
+    if (!visible) {
+      // When the list lis hidden, clear the unread count, and mark all
+      // notifications as read and shown.
       unread_count_ = 0;
-    } else {
-      // Mark all notifications as read and shown when the list is hidden.
       for (Notifications::iterator iter = notifications_.begin();
            iter != notifications_.end(); ++iter) {
         iter->is_read = true;
         iter->shown_as_popup = true;
       }
     }
   }
 
   void AddNotification(const std::string& id,
                        const string16& title,
@@ skipping 941 matching lines @@
   internal::PopupBubbleContentsView* contents_view_;
   size_t num_popups_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupBubble);
 };
 
 // WebNotificationTray ---------------------------------------------------------
 
 WebNotificationTray::WebNotificationTray(
     internal::StatusAreaWidget* status_area_widget)
-    : internal::TrayBackgroundView(status_area_widget),
+    : internal::TrayBackgroundView(status_area_widget, false),
       notification_list_(new WebNotificationList()),
-      count_label_(NULL),
+      button_(NULL),
       delegate_(NULL),
       show_message_center_on_unlock_(false) {
-  count_label_ = new views::Label(UTF8ToUTF16("0"));
-  internal::SetupLabelForTray(count_label_);
-  gfx::Font font = count_label_->font();
-  count_label_->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
-  count_label_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
-  count_label_->SetEnabledColor(kMessageCountColor);
+  button_ = new views::ImageButton(this);
 
-  tray_container()->set_size(gfx::Size(kTrayWidth, kTrayHeight));
-  tray_container()->AddChildView(count_label_);
+  tray_container()->AddChildView(button_);
 
   UpdateTray();
 }
 
 WebNotificationTray::~WebNotificationTray() {
   // Release any child views that might have back pointers before ~View().
   notification_list_.reset();
   message_center_bubble_.reset();
   popup_bubble_.reset();
 }
@@ skipping 57 matching lines @@
   status_area_widget()->SetHideSystemNotifications(true);
   UpdateShouldShowLauncher();
 }
 
 void WebNotificationTray::HideMessageCenterBubble() {
   if (!message_center_bubble())
     return;
   message_center_bubble_.reset();
   show_message_center_on_unlock_ = false;
   notification_list_->SetMessageCenterVisible(false);
+  UpdateTray();
   status_area_widget()->SetHideSystemNotifications(false);
   UpdateShouldShowLauncher();
 }
 
 void WebNotificationTray::SetHidePopupBubble(bool hide) {
   if (hide)
     HidePopupBubble();
   else
     ShowPopupBubble();
 }
@@ skipping 41 matching lines @@
   if (!popup_bubble())
     return false;
   return popup_bubble_->bubble_view()->GetBoundsInScreen().Contains(
       gfx::Screen::GetCursorScreenPoint());
 }
 
 void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
-  if (alignment == SHELF_ALIGNMENT_BOTTOM)
-    tray_container()->set_size(gfx::Size(kTrayWidth, kTrayHeight));
-  else
-    tray_container()->set_size(gfx::Size(kTraySideWidth, kTraySideHeight));
   // Destroy any existing bubble so that it will be rebuilt correctly.
   HideMessageCenterBubble();
   HidePopupBubble();
 }
 
 void WebNotificationTray::AnchorUpdated() {
   if (popup_bubble_.get()) {
     popup_bubble_->bubble_view()->UpdateBubble();
     // Ensure that the notification buble is above the launcher/status area.
     popup_bubble_->bubble_view()->GetWidget()->StackAtTop();
@@ skipping 45 matching lines @@
 }
 
 void WebNotificationTray::DisableByUrl(const std::string& id) {
   if (delegate_)
     delegate_->DisableNotificationsFromSource(id);
   // Will call SendRemoveNotification for each matching notification.
   notification_list_->SendRemoveNotificationsBySource(this, id);
 }
 
 bool WebNotificationTray::PerformAction(const ui::Event& event) {
-  if (message_center_bubble())
-    HideMessageCenterBubble();
-  else
-    ShowMessageCenterBubble();
+  ToggleMessageCenterBubble();
   return true;
 }
 
+void WebNotificationTray::ButtonPressed(views::Button* sender,
+                                        const ui::Event& event) {
+  DCHECK(sender == button_);
+  ToggleMessageCenterBubble();
+}
+
 void WebNotificationTray::ShowSettings(const std::string& id) {
   if (delegate_)
     delegate_->ShowSettings(id);
 }
 
 void WebNotificationTray::OnClicked(const std::string& id) {
   if (delegate_)
     delegate_->OnClicked(id);
 }
 
 // Other private methods
 
+void WebNotificationTray::ToggleMessageCenterBubble() {
+  if (message_center_bubble())
+    HideMessageCenterBubble();
+  else
+    ShowMessageCenterBubble();
+  UpdateTray();
+}
+
 void WebNotificationTray::UpdateTray() {
-  count_label_->SetText(UTF8ToUTF16(
-      GetNotificationText(notification_list()->unread_count())));
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  if (notification_list()->unread_count() > 0) {
+    button_->SetImage(views::CustomButton::BS_NORMAL, rb.GetImageSkiaNamed(
+        IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_NORMAL));
+    button_->SetImage(views::CustomButton::BS_HOT, rb.GetImageSkiaNamed(
+        IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_HOVER));
+    button_->SetImage(views::CustomButton::BS_PUSHED, rb.GetImageSkiaNamed(
+        IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_ACTIVE_PRESSED));
+  } else {
+    button_->SetImage(views::CustomButton::BS_NORMAL, rb.GetImageSkiaNamed(
+        IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_NORMAL));
+    button_->SetImage(views::CustomButton::BS_HOT, rb.GetImageSkiaNamed(
+        IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_HOVER));
+    button_->SetImage(views::CustomButton::BS_PUSHED, rb.GetImageSkiaNamed(
+        IDR_AURA_UBER_TRAY_NOTIFY_BUTTON_INACTIVE_PRESSED));
+  }
+  if (message_center_bubble())
+    button_->SetState(views::CustomButton::BS_PUSHED);
+  else
+    button_->SetState(views::CustomButton::BS_NORMAL);
   bool is_visible =
       (status_area_widget()->login_status() != user::LOGGED_IN_NONE) &&
       (status_area_widget()->login_status() != user::LOGGED_IN_LOCKED) &&
       (!notification_list()->notifications().empty());
   SetVisible(is_visible);
   Layout();
   SchedulePaint();
 }
 
 void WebNotificationTray::UpdateTrayAndBubble() {
-  UpdateTray();
-
   if (message_center_bubble())
     message_center_bubble()->ScheduleUpdate();
 
   if (popup_bubble()) {
     if (notification_list_->notifications().size() == 0)
       HidePopupBubble();
     else
       popup_bubble()->ScheduleUpdate();
   }
+  UpdateTray();
 }
 
 void WebNotificationTray::HideBubble(Bubble* bubble) {
   if (bubble == message_center_bubble()) {
     HideMessageCenterBubble();
   } else if (bubble == popup_bubble()) {
     HidePopupBubble();
   }
 }
 
@@ skipping 17 matching lines @@
   return message_center_bubble()->MessageViewsForTest();
 }
 
 size_t WebNotificationTray::GetPopupNotificationCountForTest() const {
   if (!popup_bubble())
     return 0;
   return popup_bubble()->MessageViewsForTest();
 }
 
 }  // namespace ash