diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/chromium/src/WebNotification.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/chromium/src/WebNotification.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebNotification.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/WebKit/chromium/src/WebNotification.cpp b/Source/WebKit/chromium/src/WebNotification.cpp index 849dc4f67..f6e981d3c 100644 --- a/Source/WebKit/chromium/src/WebNotification.cpp +++ b/Source/WebKit/chromium/src/WebNotification.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "WebNotification.h" -#if ENABLE(NOTIFICATIONS) +#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) #include "Event.h" #include "Notification.h" @@ -88,13 +88,13 @@ WebURL WebNotification::iconURL() const WebString WebNotification::title() const { ASSERT(!isHTML()); - return m_private->contents().title; + return m_private->title(); } WebString WebNotification::body() const { ASSERT(!isHTML()); - return m_private->contents().body; + return m_private->body(); } WebTextDirection WebNotification::direction() const @@ -106,7 +106,7 @@ WebTextDirection WebNotification::direction() const WebString WebNotification::replaceId() const { - return m_private->replaceId(); + return m_private->tag(); } void WebNotification::detachPresenter() @@ -116,7 +116,10 @@ void WebNotification::detachPresenter() void WebNotification::dispatchDisplayEvent() { +#if ENABLE(LEGACY_NOTIFICATIONS) dispatchEvent("display"); +#endif + dispatchEvent("show"); } void WebNotification::dispatchErrorEvent(const WebKit::WebString& /* errorMessage */) @@ -174,4 +177,4 @@ void WebNotification::assign(WebNotificationPrivate* p) } // namespace WebKit -#endif // ENABLE(NOTIFICATIONS) +#endif // ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) |