Change Ash web notification behavior

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_
 
 #include "ash/ash_export.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/tray_background_view.h"
@@ skipping 34 matching lines @@
 }
 
 // There are different methods for creating bubble views.
 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();
+  explicit SystemTray(internal::StatusAreaWidget* status_area_widget);
   virtual ~SystemTray();
 
   // 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);
@@ skipping 26 matching lines @@
 
   // 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 any bubble is visible.
+  bool IsAnyBubbleVisible() 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 {
@@ skipping 73 matching lines @@
                  BubbleCreationType creation_type,
                  int x_offset);
 
   // Constructs or re-constructs |notification_bubble_| and populates it with
   // |notification_items_|, or destroys it if there are no notification items.
   void UpdateNotificationBubble();
 
   // Called when the anchor (tray or bubble) may have moved or changed.
   void UpdateNotificationAnchor();
 
-  void SetBorder();
-
   // 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;
 
   // Owned items.
   ScopedVector<SystemTrayItem> items_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_;
   std::vector<SystemTrayItem*> notification_items_;
 
-  // The container for all the tray views of the items.
-  internal::SystemTrayContainer* tray_container_;
-
   // Mappings of system tray item and it's view in the tray.
   std::map<SystemTrayItem*, views::View*> tray_item_map_;
 
   // 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_;
   LocaleObserver* locale_observer_;
   NetworkObserver* network_observer_;
   ObserverList<PowerStatusObserver> power_status_observers_;
   SmsObserver* sms_observer_;
   UpdateObserver* update_observer_;
   UserObserver* user_observer_;
 
   // Bubble for default and detailed views.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
-  // Buble for notifications.
+  // Bubble for notifications.
   scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
   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_