summaryrefslogtreecommitdiffstats
path: root/chrome/browser/status_icons
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 18:10:36 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 18:10:36 +0000
commitfe12aaa20a8327bd0473dc39c5a742d0cc8a19ba (patch)
tree9f1d4eb9603fb07bae10a27aa57536b585a4adf7 /chrome/browser/status_icons
parentd7646cb9b871b988d91a1d702f4d490cbbcf434f (diff)
downloadchromium_src-fe12aaa20a8327bd0473dc39c5a742d0cc8a19ba.zip
chromium_src-fe12aaa20a8327bd0473dc39c5a742d0cc8a19ba.tar.gz
chromium_src-fe12aaa20a8327bd0473dc39c5a742d0cc8a19ba.tar.bz2
Add support for Ash to Notifications
* Adds BalloonViewAsh and moves/renames related classes. * Adds support for image icons to Notification class * Adds GetRenderViewHost() method to NotificationDelegate for fetching images BUG=124914 TEST=Tests pass. No visual changes to notifications on non-ash platforms. Web notifications show up in new tray on Ash with --ash-notify. For CloudPrintProxyService: TBR=scottbyer@chromium.org Review URL: https://chromiumcodereview.appspot.com/10537158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/status_icons')
-rw-r--r--chrome/browser/status_icons/desktop_notification_balloon.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/status_icons/desktop_notification_balloon.cc b/chrome/browser/status_icons/desktop_notification_balloon.cc
index 70d46ee..d49a8bb 100644
--- a/chrome/browser/status_icons/desktop_notification_balloon.cc
+++ b/chrome/browser/status_icons/desktop_notification_balloon.cc
@@ -49,6 +49,9 @@ class DummyNotificationDelegate : public NotificationDelegate {
virtual void Close(bool by_user) OVERRIDE {}
virtual void Click() OVERRIDE {}
virtual std::string id() const OVERRIDE { return id_; }
+ virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE {
+ return NULL;
+ }
private:
virtual ~DummyNotificationDelegate() {}