| Index: chrome/browser/chromeos/notifications/balloon_collection_impl.h | 
| =================================================================== | 
| --- chrome/browser/chromeos/notifications/balloon_collection_impl.h	(revision 65581) | 
| +++ chrome/browser/chromeos/notifications/balloon_collection_impl.h	(working copy) | 
| @@ -60,12 +60,13 @@ | 
| // BalloonCollectionInterface overrides | 
| virtual void Add(const Notification& notification, | 
| Profile* profile); | 
| -  virtual bool Remove(const Notification& notification); | 
| +  virtual bool RemoveById(const std::string& id); | 
| +  virtual bool RemoveBySourceOrigin(const GURL& origin); | 
| virtual bool HasSpace() const; | 
| virtual void ResizeBalloon(Balloon* balloon, const gfx::Size& size); | 
| virtual void DisplayChanged() {} | 
| virtual void OnBalloonClosed(Balloon* source); | 
| -  virtual const Balloons& GetActiveBalloons() { return balloons_; } | 
| +  virtual const Balloons& GetActiveBalloons() { return base_.balloons(); } | 
|  | 
| // NotificationObserver overrides: | 
| virtual void Observe(NotificationType type, | 
| @@ -115,20 +116,15 @@ | 
| virtual Balloon* MakeBalloon(const Notification& notification, | 
| Profile* profile); | 
|  | 
| +  // Base implementation for the collection of active balloons. | 
| +  BalloonCollectionBase base_; | 
| + | 
| private: | 
| friend class NotificationPanelTester; | 
|  | 
| // Shutdown the notification ui. | 
| void Shutdown(); | 
|  | 
| -  // The number of balloons being displayed. | 
| -  int count() const { return balloons_.size(); } | 
| - | 
| -  Balloons::iterator FindBalloon(const Notification& notification); | 
| - | 
| -  // Queue of active balloons. | 
| -  Balloons balloons_; | 
| - | 
| scoped_ptr<NotificationUI> notification_ui_; | 
|  | 
| NotificationRegistrar registrar_; | 
|  |