Change Ash web notification behavior

ash/system/web_notification/web_notification_tray.h

 // 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.
 
 #ifndef ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
 #define ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
 
 #include "ash/ash_export.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/user/login_status.h"
 #include "base/gtest_prod_util.h"
 #include "ui/aura/event_filter.h"
 
 namespace aura {
 class LocatedEvent;
 }
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace views {
-class ImageView;
+class Label;
 }
 
 namespace ash {
 
 namespace internal {
 class StatusAreaWidget;
 class WebNotificationList;
 }
 
 // Status area tray for showing browser and app notifications. The client
@@ skipping 63 matching lines @@
   void RemoveAllNotifications();
 
   // Set the notification image.
   void SetNotificationImage(const std::string& id,
                             const gfx::ImageSkia& image);
 
   // Disable all notifications matching notification |id|.
   void DisableByExtension(const std::string& id);
   void DisableByUrl(const std::string& id);
 
-  // Show the notification bubble. Should only be called by StatusAreaWidget.
-  void ShowBubble();
+  // Show the message center bubble. Should only be called by StatusAreaWidget.
+  void ShowMessageCenterBubble();
 
-  // Hide the notification bubble. Should only be called by StatusAreaWidget.
-  void HideBubble();
+  // Hide the message center bubble. Should only be called by StatusAreaWidget.
+  void HideMessageCenterBubble();
+
+  // Show a single notification bubble for the most recent notification.
+  void ShowNotificationBubble();
+
+  // Hide the single notification bubble if visible.
+  void HideNotificationBubble();
 
   // Updates tray visibility login status of the system changes.
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   // Request the Delegate to the settings dialog.
   void ShowSettings(const std::string& id);
 
   // Called when a notification is clicked on. Event is passed to the Delegate.
   void OnClicked(const std::string& id);
 
-  internal::StatusAreaWidget* status_area_widget() {
-    return status_area_widget_;
-  }
-
   // Overridden from TrayBackgroundView.
   virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
 
   // Overridden from internal::ActionableView.
   virtual bool PerformAction(const views::Event& event) OVERRIDE;
 
  private:
   class Bubble;
-  class BubbleContentsView;
   FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications);
 
-  void SetBorder();
-  void SetTrayContainerBorder();
   int GetNotificationCount() const;
-  void UpdateIcon();
-  void UpdateBubbleAndIcon();
+  void UpdateTray();
+  void UpdateTrayAndBubble();
+  void HideBubble(Bubble* bubble);
 
   const internal::WebNotificationList* notification_list() const {
     return notification_list_.get();
   }
-  views::View* tray_container() const { return tray_container_; }
-  Bubble* bubble() const { return bubble_.get(); }
+  Bubble* message_center_bubble() const { return message_center_bubble_.get(); }
+  Bubble* notification_bubble() const { return notification_bubble_.get(); }
 
-  internal::StatusAreaWidget* status_area_widget_;  // Unowned parent.
   scoped_ptr<internal::WebNotificationList> notification_list_;
-  scoped_ptr<Bubble> bubble_;
-  views::View* tray_container_;
-  views::ImageView* icon_;
+  scoped_ptr<Bubble> message_center_bubble_;
+  scoped_ptr<Bubble> notification_bubble_;
+  views::Label* count_label_;
   Delegate* delegate_;
-  bool show_bubble_on_unlock_;
+  bool show_message_center_on_unlock_;
+  int unread_count_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_