diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit/chromium/src/NotificationPresenterImpl.cpp | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit/chromium/src/NotificationPresenterImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/NotificationPresenterImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/NotificationPresenterImpl.cpp b/Source/WebKit/chromium/src/NotificationPresenterImpl.cpp index 4b68235a1..99a7ea378 100644 --- a/Source/WebKit/chromium/src/NotificationPresenterImpl.cpp +++ b/Source/WebKit/chromium/src/NotificationPresenterImpl.cpp @@ -98,10 +98,10 @@ void NotificationPresenterImpl::notificationControllerDestroyed() { } -NotificationPresenter::Permission NotificationPresenterImpl::checkPermission(ScriptExecutionContext* context) +NotificationClient::Permission NotificationPresenterImpl::checkPermission(ScriptExecutionContext* context) { int result = m_presenter->checkPermission(WebSecurityOrigin(context->securityOrigin())); - return static_cast<NotificationPresenter::Permission>(result); + return static_cast<NotificationClient::Permission>(result); } void NotificationPresenterImpl::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback) |