Add SystemTrayObservers

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/system_tray_bubble.h"
@@ skipping 16 matching lines @@
 class AudioObserver;
 class BluetoothObserver;
 class BrightnessObserver;
 class CapsLockObserver;
 class ClockObserver;
 class DriveObserver;
 class IMEObserver;
 class LocaleObserver;
 class LogoutButtonObserver;
 class PowerStatusObserver;
+class SystemTrayDelegate;
 class UpdateObserver;
 class UserObserver;
 #if defined(OS_CHROMEOS)
 class NetworkObserver;
 class SmsObserver;
 #endif
 
 class SystemTrayItem;
 
 namespace internal {
 class SystemBubbleWrapper;
 class SystemTrayContainer;
 class TrayGestureHandler;
 }
 
 // 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 views::TrayBubbleView::Delegate {
  public:
   explicit SystemTray(internal::StatusAreaWidget* status_area_widget);
   virtual ~SystemTray();
 
-  // Creates the default set of items for the sytem tray.
-  void CreateItems();
+  // Calls TrayBackgroundView::Initialize()

[sadrul, 2012/11/13 20:54:50]

" .. and creates the default set of items ..."

[stevenjb, 2012/11/13 21:19:53]

Done.

+  void InitializeTrayItems(SystemTrayDelegate* delegate);
 
   // Adds a new item in the tray.
   void AddTrayItem(SystemTrayItem* item);
 
   // Removes an existing tray item.
   void RemoveTrayItem(SystemTrayItem* item);
 
   // Shows the default view of all items.
   void ShowDefaultView(BubbleCreationType creation_type);
 
@@ skipping 35 matching lines @@
 
   // Returns a pointer to the system bubble or NULL if none.
   internal::SystemTrayBubble* GetSystemBubble();
 
   // Returns true if any bubble is visible.
   bool IsAnyBubbleVisible() const;
 
   // Returns true if the mouse is inside the notification bubble.
   bool IsMouseInNotificationBubble() const;
 
-  AccessibilityObserver* accessibility_observer() {
-    return accessibility_observer_;
-  }
-  AudioObserver* audio_observer() {
-    return audio_observer_;
-  }
-  BluetoothObserver* bluetooth_observer() {
-    return bluetooth_observer_;
-  }
-  BrightnessObserver* brightness_observer() {
-    return brightness_observer_;
-  }
-  CapsLockObserver* caps_lock_observer() {
-    return caps_lock_observer_;
-  }
-  ClockObserver* clock_observer() {
-    return clock_observer_;
-  }
-  DriveObserver* drive_observer() {
-    return drive_observer_;
-  }
-  IMEObserver* ime_observer() {
-    return ime_observer_;
-  }
-  LocaleObserver* locale_observer() {
-    return locale_observer_;
-  }
-  LogoutButtonObserver* logout_button_observer() {
-    return logout_button_observer_;
-  }
-#if defined(OS_CHROMEOS)
-  NetworkObserver* network_observer() {
-    return network_observer_;
-  }
-  NetworkObserver* vpn_observer() {
-    return vpn_observer_;
-  }
-  SmsObserver* sms_observer() {
-    return sms_observer_;
-  }
-#endif
-  ObserverList<PowerStatusObserver>& power_status_observers() {
-    return power_status_observers_;
-  }
-  UpdateObserver* update_observer() {
-    return update_observer_;
-  }
-  UserObserver* user_observer() {
-    return user_observer_;
-  }
-
   // Accessors for testing.
 
   // Returns true if the bubble exists.
   bool CloseBubbleForTest() const;
 
   // Overridden from TrayBackgroundView.
-  virtual void Initialize() OVERRIDE;
   virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
   virtual void AnchorUpdated() OVERRIDE;
   virtual string16 GetAccessibleNameForTray() OVERRIDE;
   virtual void HideBubbleWithView(
       const views::TrayBubbleView* bubble_view) OVERRIDE;
   virtual bool ClickedOutsideBubble() OVERRIDE;
 
   // Overridden from message_center::TrayBubbleView::Delegate.
   virtual void BubbleViewDestroyed() OVERRIDE;
   virtual void OnMouseEnteredView() OVERRIDE;
   virtual void OnMouseExitedView() OVERRIDE;
   virtual string16 GetAccessibleNameForBubble() OVERRIDE;
   virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget,
                                   AnchorType anchor_type,
                                   AnchorAlignment anchor_alignment) OVERRIDE;
   virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE;
 
  private:
+  // Creates the default set of items for the sytem tray.
+  void CreateItems(SystemTrayDelegate* delegate);
+
   // Returns true if the system_bubble_ exists and is of type |type|.
   bool HasSystemBubbleType(internal::SystemTrayBubble::BubbleType type);
 
   // Resets |system_bubble_| and clears any related state.
   void DestroySystemBubble();
 
   // Resets |notification_bubble_| and clears any related state.
   void DestroyNotificationBubble();
 
   // Calculates the x-offset for the item in the tray. Returns -1 if its tray
@@ skipping 23 matching lines @@
   // Owned items.
   ScopedVector<SystemTrayItem> items_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_;
   std::vector<SystemTrayItem*> notification_items_;
 
   // 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_;
-  LogoutButtonObserver* logout_button_observer_;
-#if defined(OS_CHROMEOS)
-  NetworkObserver* network_observer_;
-  NetworkObserver* vpn_observer_;
-  SmsObserver* sms_observer_;
-#endif
-  ObserverList<PowerStatusObserver> power_status_observers_;
-  UpdateObserver* update_observer_;
-  UserObserver* user_observer_;
-
   // Bubble for default and detailed views.
   scoped_ptr<internal::SystemBubbleWrapper> system_bubble_;
 
   // Bubble for notifications.
   scoped_ptr<internal::SystemBubbleWrapper> notification_bubble_;
 
   // 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_