Add support for Ash to Notifications

chrome/browser/ui/views/ash/balloon_collection_impl_ash.h

Index: chrome/browser/ui/views/ash/balloon_collection_impl_ash.h
diff --git a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h
index d457d6dce3a4cf943e73cf11656bc6f6fe512175..01135317b4a47ed9561d450c8c9fa1ea1187fb44 100644
--- a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h
+++ b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h
@@ -8,16 +8,31 @@
 
 #include <set>
 
+#include "ash/system/web_notification/web_notification_tray.h"
 #include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h"  // MessageCallback
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 
 // Wrapper on top of ::BalloonCollectionImpl to provide an interface for
 // chromeos::SystemNotification.
-class BalloonCollectionImplAsh : public ::BalloonCollectionImpl {
+class BalloonCollectionImplAsh : public BalloonCollectionImpl,
+                                 public ash::WebNotificationTray::Delegate {
  public:
   BalloonCollectionImplAsh();
   virtual ~BalloonCollectionImplAsh();
 
+  // Overridden from BalloonCollectionImpl.
+  virtual void Add(const Notification& notification,
+                   Profile* profile) OVERRIDE;
+  virtual bool HasSpace() const OVERRIDE;
+
+  // WebNotificationTray::Delegate interface.

[oshima, 2012/06/13 23:58:02]

Overridden from XX, or change the above for consistency.

[stevenjb, 2012/06/14 04:27:35]

Done.

+  virtual void NotificationRemoved(const std::string& notifcation_id) OVERRIDE;
+  virtual void DisableExtension(const std::string& notifcation_id) OVERRIDE;
+  virtual void DisableNotificationsFromSource(
+      const std::string& notifcation_id) OVERRIDE;
+  virtual void ShowSettings(const std::string& notifcation_id) OVERRIDE;
+  virtual void OnClicked(const std::string& notifcation_id) OVERRIDE;
+
   // Adds a callback for WebUI message. Returns true if the callback
   // is succssfully registered, or false otherwise. It fails to add if
   // there is no notification that matches NotificationDelegate::id(),