Add WebNotificationTray

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 650799ae780f78964065c9a01fd937ddc6a11302..87ee21896ebfa9283ada88dc90fd5832cc8bb164 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -10,7 +10,6 @@
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "ash/system/user/login_status.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -55,6 +54,9 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   SystemTray();
   virtual ~SystemTray();
 
+  // Overridden from TrayBackgroundView.
+  virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;

[sadrul, 2012/06/06 19:19:18]

Move this after the non-overridden methods

[stevenjb, 2012/06/06 23:12:15]

Done.

+
   // Called after the tray has been added to the widget containing it.
   void Initialize();
 
@@ -96,6 +98,12 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   // Updates the items when the shelf alignment changes.
   void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment);
 
+  // Temporarily hides/unhides the notification bubble.
+  void SetHideNotifications(bool hidden);
+
+  // Returns true if the primary bubble is visible.
+  bool IsBubbleVisible() const;
+
   // Returns true if the launcher should show.
   bool should_show_launcher() const {
     return bubble_.get() && should_show_launcher_;
@@ -146,9 +154,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   // Returns true if the bubble exists.
   bool CloseBubbleForTest() const;
 
-  void SetShelfAlignment(ShelfAlignment alignment);
-  ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
-
  private:
   friend class internal::SystemTrayLayerAnimationObserver;
   friend class internal::SystemTrayBubble;
@@ -234,9 +239,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   // See description agove getter.
   bool should_show_launcher_;
 
-  // Shelf alignment.
-  ShelfAlignment shelf_alignment_;
-
   scoped_ptr<internal::SystemTrayLayerAnimationObserver>
       layer_animation_observer_;
 
@@ -244,6 +246,10 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   // views directly (e.g. from a notification) we know what height to use.
   int default_bubble_height_;
 
+  // Set to true when system notifications should be hidden (e.g. web
+  // notification bubble is visible).
+  bool hide_notifications_;
+
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };