Add support to SystemTray for a second notification bubble.

ash/system/tray/system_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_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #pragma once
 
 #include "ash/launcher/background_animator.h"
 #include "ash/ash_export.h"
@@ skipping 20 matching lines @@
 class NetworkObserver;
 class PowerStatusObserver;
 class UpdateObserver;
 class UserObserver;
 
 class SystemTrayItem;
 
 namespace internal {
 class SystemTrayBackground;
 class SystemTrayBubble;
+class SystemTrayLayerAnimationObserver;
 }
 
 class ASH_EXPORT SystemTray : public internal::ActionableView,
                               public internal::BackgroundAnimatorDelegate {
  public:
   SystemTray();
   virtual ~SystemTray();
 
   // Creates the default set of items for the sytem tray.
   void CreateItems();
@@ skipping 13 matching lines @@
   // Shows details of a particular item. If |close_delay_in_seconds| is
   // non-zero, then the view is automatically closed after the specified time.
   void ShowDetailedView(SystemTrayItem* item,
                         int close_delay_in_seconds,
                         bool activate);
 
   // Continue showing the existing detailed view, if any, for |close_delay|
   // seconds.
   void SetDetailedViewCloseDelay(int close_delay);
 
+  // Shows the notification view for |item|.
+  void ShowNotificationView(SystemTrayItem* item);
+
+  // Hides the notification view for |item|.
+  void HideNotificationView(SystemTrayItem* item);
+
   // Updates the items when the login status of the system changes.
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   // Sets whether the tray paints a background. Default is true, but is set to
   // false if a window overlaps the shelf.
   void SetPaintsBackground(
       bool value,
       internal::BackgroundAnimator::ChangeType change_type);
 
   // Returns true if the launcher should show.
@@ skipping 39 matching lines @@
   UserObserver* user_observer() const {
     return user_observer_;
   }
 
   // Accessors for testing.
 
   // Returns true if the bubble exists.
   bool CloseBubbleForTest() const;
 
  private:
+  friend class internal::SystemTrayLayerAnimationObserver;
   friend class internal::SystemTrayBubble;
 
   // Called when the widget associated with |bubble| closes. |bubble| should
   // always == |bubble_|. This triggers destroying |bubble_| and hiding the
   // launcher if necessary.
   void RemoveBubble(internal::SystemTrayBubble* bubble);
 
   const ScopedVector<SystemTrayItem>& items() const { return items_; }
 
+  // Constructs or re-constructs |bubble_| and populates it with |items|.
   void ShowItems(const std::vector<SystemTrayItem*>& items,
                  bool details,
                  bool activate);
 
+  // Constructs or re-constructs |notification_bubble_| and populates it with
+  // |notification_items_|, or destroys it if there are no notification items.
+  void ShowNotifications();
+
+  // Called when the anchor (tray or bubble) may have moved or changed.
+  void UpdateNotificationAnchor();
+
   // Overridden from internal::ActionableView.
   virtual bool PerformAction(const views::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from internal::BackgroundAnimatorDelegate.
   virtual void UpdateBackground(int alpha) OVERRIDE;
 
   ScopedVector<SystemTrayItem> items_;
 
+  std::vector<SystemTrayItem*> notification_items_;
+
   // The container for all the tray views of the items.
-  views::View* container_;
+  views::View* tray_container_;
 
   // These observers are not owned by the tray.
   AccessibilityObserver* accessibility_observer_;
   AudioObserver* audio_observer_;
   BluetoothObserver* bluetooth_observer_;
   BrightnessObserver* brightness_observer_;
   CapsLockObserver* caps_lock_observer_;
   ClockObserver* clock_observer_;
   DriveObserver* drive_observer_;
   IMEObserver* ime_observer_;
   NetworkObserver* network_observer_;
   PowerStatusObserver* power_status_observer_;
   UpdateObserver* update_observer_;
   UserObserver* user_observer_;
 
   // The widget hosting the tray.
   views::Widget* widget_;
 
-  // The popup widget and the delegate.
+  // Bubble for default and detailed views.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
+  // Buble for notifications.
+  scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
+
   // Owned by the view it's installed on.
   internal::SystemTrayBackground* background_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
   internal::BackgroundAnimator hide_background_animator_;
   internal::BackgroundAnimator hover_background_animator_;
+  scoped_ptr<internal::SystemTrayLayerAnimationObserver>
+      layer_animation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_