From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 27 Apr 2010 16:31:00 +0100
Subject: Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
---
 WebKit/chromium/src/WebNotification.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebKit/chromium/src/WebNotification.cpp')

diff --git a/WebKit/chromium/src/WebNotification.cpp b/WebKit/chromium/src/WebNotification.cpp
index 1f6916e..5200d17 100644
--- a/WebKit/chromium/src/WebNotification.cpp
+++ b/WebKit/chromium/src/WebNotification.cpp
@@ -76,10 +76,10 @@ WebURL WebNotification::url() const
     return m_private->url();
 }
 
-WebString WebNotification::icon() const
+WebURL WebNotification::iconURL() const
 {
     ASSERT(!isHTML());
-    return m_private->contents().icon();
+    return m_private->iconURL();
 }
 
 WebString WebNotification::title() const
-- 
cgit v1.1