Add WebNotificationTray

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/ash_export.h"
 #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"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/view.h"
 
 #include <map>
 #include <vector>
 
 namespace ash {
@@ skipping 24 matching lines @@
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
 
 class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
  public:
   SystemTray();
   virtual ~SystemTray();
 
+  // Overridden from TrayBackgroundView.
+  virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
+
   // Called after the tray has been added to the widget containing it.
   void Initialize();
 
   // Creates the default set of items for the sytem tray.
   void CreateItems();
 
   // Adds a new item in the tray.
   void AddTrayItem(SystemTrayItem* item);
 
   // Removes an existing tray item.
@@ skipping 21 matching lines @@
 
   // 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);
 
   // 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_;
   }
 
   AccessibilityObserver* accessibility_observer() const {
     return accessibility_observer_;
   }
   AudioObserver* audio_observer() const {
     return audio_observer_;
@@ skipping 30 matching lines @@
   }
   UserObserver* user_observer() const {
     return user_observer_;
   }
 
   // Accessors for testing.
 
   // 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;
 
   // Resets |bubble_| and clears any related state.
   void DestroyBubble();
 
   // Called when the widget associated with |bubble| closes. |bubble| should
   // always == |bubble_|. This triggers destroying |bubble_| and hiding the
   // launcher if necessary.
@@ skipping 65 matching lines @@
 
   // Bubble for default and detailed views.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
   // Buble for notifications.
   scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
-  // Shelf alignment.
-  ShelfAlignment shelf_alignment_;
-
   scoped_ptr<internal::SystemTrayLayerAnimationObserver>
       layer_animation_observer_;
 
   // Keep track of the default view height so that when we create detailed
   // 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);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_