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

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

Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 4 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/PushPermissionStatusCallbacks.h" 6 #include "modules/push_messaging/PushPermissionStatusCallbacks.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 "wtf/text/WTFString.h" 10 #include "wtf/text/WTFString.h"
(...skipping 12 matching lines...) Expand all
23 void PushPermissionStatusCallbacks::onSuccess(WebPushPermissionStatus* status) 23 void PushPermissionStatusCallbacks::onSuccess(WebPushPermissionStatus* status)
24 { 24 {
25 m_resolver->resolve(permissionString(*status)); 25 m_resolver->resolve(permissionString(*status));
26 } 26 }
27 27
28 void PushPermissionStatusCallbacks::onError(WebPushError* error) 28 void PushPermissionStatusCallbacks::onError(WebPushError* error)
29 { 29 {
30 OwnPtr<WebPushError> ownError = adoptPtr(error); 30 OwnPtr<WebPushError> ownError = adoptPtr(error);
31 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) 31 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped())
32 return; 32 return;
33 m_resolver->reject(PushError::take(m_resolver.get(), ownError.release())); 33 m_resolver->reject(PushError::take(m_resolver.get(), *ownError));
34 } 34 }
35 35
36 // static 36 // static
37 String PushPermissionStatusCallbacks::permissionString(WebPushPermissionStatus s tatus) 37 String PushPermissionStatusCallbacks::permissionString(WebPushPermissionStatus s tatus)
38 { 38 {
39 switch (status) { 39 switch (status) {
40 case WebPushPermissionStatusGranted: 40 case WebPushPermissionStatusGranted:
41 return "granted"; 41 return "granted";
42 case WebPushPermissionStatusDenied: 42 case WebPushPermissionStatusDenied:
43 return "denied"; 43 return "denied";
44 case WebPushPermissionStatusPrompt: 44 case WebPushPermissionStatusPrompt:
45 return "prompt"; 45 return "prompt";
46 } 46 }
47 47
48 ASSERT_NOT_REACHED(); 48 ASSERT_NOT_REACHED();
49 return "denied"; 49 return "denied";
50 } 50 }
51 51
52 } // namespace blink 52 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/push_messaging/PushError.cpp ('k') | Source/modules/push_messaging/PushSubscriptionCallbacks.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698