| Index: ash/system/tray/system_tray.h
|
| diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
|
| index abbbbd694cf7876a25d57729c518ff5d70008cd0..7c5aa4f743783147ed18b0b8a6acfc309bb72c9d 100644
|
| --- a/ash/system/tray/system_tray.h
|
| +++ b/ash/system/tray/system_tray.h
|
| @@ -56,9 +56,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView,
|
| // Returns all tray items that has been added to system tray.
|
| const std::vector<SystemTrayItem*>& GetTrayItems() const;
|
|
|
| - // Returns all tray user items that were added to the system tray.
|
| - const std::vector<internal::TrayUser*>& GetTrayUserItems() const;
|
| -
|
| // Shows the default view of all items.
|
| void ShowDefaultView(BubbleCreationType creation_type);
|
|
|
| @@ -154,10 +151,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView,
|
| // Get the tray item view (or NULL) for a given |tray_item| in a unit test.
|
| views::View* GetTrayItemViewForTest(SystemTrayItem* tray_item);
|
|
|
| - // Add a tray user item for testing purposes. Note: The passed |tray_user|
|
| - // will be owned by the SystemTray after the call.
|
| - void AddTrayUserItemForTest(internal::TrayUser* tray_user);
|
| -
|
| // Gets tray_date_ for browser tests.
|
| internal::TrayDate* GetTrayDateForTesting() const;
|
|
|
| @@ -209,10 +202,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView,
|
| // Owned items.
|
| ScopedVector<SystemTrayItem> items_;
|
|
|
| - // User items - note, this is a subset of the |items_| list. Note that no
|
| - // item in this list needs to be deleted.
|
| - std::vector<internal::TrayUser*> user_items_;
|
| -
|
| // Pointers to members of |items_|.
|
| SystemTrayItem* detailed_item_;
|
| std::vector<SystemTrayItem*> notification_items_;
|
|
|