Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Side by Side Diff: Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

Issue 841333002: Push API: rename registration to subscription. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use https in the spec link. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/push_messaging/PushRegistrationCallbacks.h" 6 #include "modules/push_messaging/PushSubscriptionCallbacks.h"
7 7
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "modules/push_messaging/PushError.h" 9 #include "modules/push_messaging/PushError.h"
10 #include "modules/push_messaging/PushRegistration.h" 10 #include "modules/push_messaging/PushSubscription.h"
11 #include "modules/serviceworkers/ServiceWorkerRegistration.h" 11 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
12 12
13 namespace blink { 13 namespace blink {
14 14
15 PushRegistrationCallbacks::PushRegistrationCallbacks(PassRefPtrWillBeRawPtr<Scri ptPromiseResolver> resolver, ServiceWorkerRegistration* registration) 15 PushSubscriptionCallbacks::PushSubscriptionCallbacks(PassRefPtrWillBeRawPtr<Scri ptPromiseResolver> resolver, ServiceWorkerRegistration* serviceWorkerRegistratio n)
16 : m_resolver(resolver) 16 : m_resolver(resolver)
17 , m_serviceWorkerRegistration(registration) 17 , m_serviceWorkerRegistration(serviceWorkerRegistration)
18 { 18 {
19 ASSERT(m_resolver); 19 ASSERT(m_resolver);
20 ASSERT(m_serviceWorkerRegistration); 20 ASSERT(m_serviceWorkerRegistration);
21 } 21 }
22 22
23 PushRegistrationCallbacks::~PushRegistrationCallbacks() 23 PushSubscriptionCallbacks::~PushSubscriptionCallbacks()
24 { 24 {
25 } 25 }
26 26
27 void PushRegistrationCallbacks::onSuccess(WebPushRegistration* webPushRegistrati on) 27 void PushSubscriptionCallbacks::onSuccess(WebPushSubscription* webPushSubscripti on)
28 { 28 {
29 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) { 29 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) {
30 PushRegistration::dispose(webPushRegistration); 30 PushSubscription::dispose(webPushSubscription);
31 return; 31 return;
32 } 32 }
33 33
34 if (!webPushRegistration) { 34 if (!webPushSubscription) {
35 m_resolver->resolve(v8::Null(m_resolver->scriptState()->isolate())); 35 m_resolver->resolve(v8::Null(m_resolver->scriptState()->isolate()));
36 return; 36 return;
37 } 37 }
38 m_resolver->resolve(PushRegistration::take(m_resolver.get(), webPushRegistra tion, m_serviceWorkerRegistration)); 38 m_resolver->resolve(PushSubscription::take(m_resolver.get(), webPushSubscrip tion, m_serviceWorkerRegistration));
39 } 39 }
40 40
41 void PushRegistrationCallbacks::onError(WebPushError* error) 41 void PushSubscriptionCallbacks::onError(WebPushError* error)
42 { 42 {
43 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) { 43 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) {
44 PushError::dispose(error); 44 PushError::dispose(error);
45 return; 45 return;
46 } 46 }
47 m_resolver->reject(PushError::take(m_resolver.get(), error)); 47 m_resolver->reject(PushError::take(m_resolver.get(), error));
48 } 48 }
49 49
50 } // namespace blink 50 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/push_messaging/PushSubscriptionCallbacks.h ('k') | public/platform/WebPushClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698