diff options
author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 18:10:36 +0000 |
---|---|---|
committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 18:10:36 +0000 |
commit | fe12aaa20a8327bd0473dc39c5a742d0cc8a19ba (patch) | |
tree | 9f1d4eb9603fb07bae10a27aa57536b585a4adf7 /chrome/browser/notifications/notification_test_util.h | |
parent | d7646cb9b871b988d91a1d702f4d490cbbcf434f (diff) | |
download | chromium_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/notifications/notification_test_util.h')
-rw-r--r-- | chrome/browser/notifications/notification_test_util.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/notifications/notification_test_util.h b/chrome/browser/notifications/notification_test_util.h index 7ea3ac7..418f672 100644 --- a/chrome/browser/notifications/notification_test_util.h +++ b/chrome/browser/notifications/notification_test_util.h @@ -24,6 +24,7 @@ class MockNotificationDelegate : public NotificationDelegate { virtual void Close(bool by_user) OVERRIDE {} virtual void Click() OVERRIDE {} virtual std::string id() const OVERRIDE; + virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE; private: virtual ~MockNotificationDelegate(); @@ -47,24 +48,28 @@ class LoggingNotificationDelegate : public NotificationDelegate { } // NotificationObjectProxy override - virtual void Display() { + virtual void Display() OVERRIDE { Logger::log("notification displayed\n"); } - virtual void Error() { + virtual void Error() OVERRIDE { Logger::log("notification error\n"); } - virtual void Click() { + virtual void Click() OVERRIDE { Logger::log("notification clicked\n"); } - virtual void Close(bool by_user) { + virtual void Close(bool by_user) OVERRIDE { if (by_user) Logger::log("notification closed by user\n"); else Logger::log("notification closed by script\n"); } - virtual std::string id() const { + virtual std::string id() const OVERRIDE { return notification_id_; } + virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE { + return NULL; + } + private: std::string notification_id_; |