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

Side by Side Diff: third_party/WebKit/Source/modules/credentialmanager/CredentialsContainer.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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
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 "modules/credentialmanager/CredentialsContainer.h" 5 #include "modules/credentialmanager/CredentialsContainer.h"
6 6
7 #include "bindings/core/v8/Dictionary.h" 7 #include "bindings/core/v8/Dictionary.h"
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "core/dom/DOMException.h" 10 #include "core/dom/DOMException.h"
11 #include "core/dom/Document.h" 11 #include "core/dom/Document.h"
12 #include "core/dom/ExceptionCode.h" 12 #include "core/dom/ExceptionCode.h"
13 #include "core/dom/ExecutionContext.h" 13 #include "core/dom/ExecutionContext.h"
14 #include "core/frame/Frame.h" 14 #include "core/frame/Frame.h"
15 #include "core/frame/UseCounter.h" 15 #include "core/frame/UseCounter.h"
16 #include "core/page/FrameTree.h" 16 #include "core/page/FrameTree.h"
17 #include "modules/credentialmanager/Credential.h" 17 #include "modules/credentialmanager/Credential.h"
18 #include "modules/credentialmanager/CredentialManagerClient.h" 18 #include "modules/credentialmanager/CredentialManagerClient.h"
19 #include "modules/credentialmanager/CredentialRequestOptions.h" 19 #include "modules/credentialmanager/CredentialRequestOptions.h"
20 #include "modules/credentialmanager/FederatedCredential.h" 20 #include "modules/credentialmanager/FederatedCredential.h"
21 #include "modules/credentialmanager/FederatedCredentialRequestOptions.h" 21 #include "modules/credentialmanager/FederatedCredentialRequestOptions.h"
22 #include "modules/credentialmanager/PasswordCredential.h" 22 #include "modules/credentialmanager/PasswordCredential.h"
23 #include "platform/weborigin/SecurityOrigin.h" 23 #include "platform/weborigin/SecurityOrigin.h"
24 #include "public/platform/Platform.h" 24 #include "public/platform/Platform.h"
25 #include "public/platform/WebCredential.h" 25 #include "public/platform/WebCredential.h"
26 #include "public/platform/WebCredentialManagerClient.h" 26 #include "public/platform/WebCredentialManagerClient.h"
27 #include "public/platform/WebCredentialManagerError.h" 27 #include "public/platform/WebCredentialManagerError.h"
28 #include "public/platform/WebFederatedCredential.h" 28 #include "public/platform/WebFederatedCredential.h"
29 #include "public/platform/WebPasswordCredential.h" 29 #include "public/platform/WebPasswordCredential.h"
30 #include "wtf/PtrUtil.h"
31 #include <memory>
30 32
31 namespace blink { 33 namespace blink {
32 34
33 static void rejectDueToCredentialManagerError(ScriptPromiseResolver* resolver, W ebCredentialManagerError reason) 35 static void rejectDueToCredentialManagerError(ScriptPromiseResolver* resolver, W ebCredentialManagerError reason)
34 { 36 {
35 switch (reason) { 37 switch (reason) {
36 case WebCredentialManagerDisabledError: 38 case WebCredentialManagerDisabledError:
37 resolver->reject(DOMException::create(InvalidStateError, "The credential manager is disabled.")); 39 resolver->reject(DOMException::create(InvalidStateError, "The credential manager is disabled."));
38 break; 40 break;
39 case WebCredentialManagerPendingRequestError: 41 case WebCredentialManagerPendingRequestError:
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 WTF_MAKE_NONCOPYABLE(RequestCallbacks); 75 WTF_MAKE_NONCOPYABLE(RequestCallbacks);
74 public: 76 public:
75 explicit RequestCallbacks(ScriptPromiseResolver* resolver) : m_resolver(reso lver) { } 77 explicit RequestCallbacks(ScriptPromiseResolver* resolver) : m_resolver(reso lver) { }
76 ~RequestCallbacks() override { } 78 ~RequestCallbacks() override { }
77 79
78 void onSuccess(std::unique_ptr<WebCredential> webCredential) override 80 void onSuccess(std::unique_ptr<WebCredential> webCredential) override
79 { 81 {
80 Frame* frame = toDocument(m_resolver->getScriptState()->getExecutionCont ext())->frame(); 82 Frame* frame = toDocument(m_resolver->getScriptState()->getExecutionCont ext())->frame();
81 SECURITY_CHECK(!frame || frame == frame->tree().top()); 83 SECURITY_CHECK(!frame || frame == frame->tree().top());
82 84
83 OwnPtr<WebCredential> credential = adoptPtr(webCredential.release()); 85 std::unique_ptr<WebCredential> credential = wrapUnique(webCredential.rel ease());
84 if (!credential || !frame) { 86 if (!credential || !frame) {
85 m_resolver->resolve(); 87 m_resolver->resolve();
86 return; 88 return;
87 } 89 }
88 90
89 ASSERT(credential->isPasswordCredential() || credential->isFederatedCred ential()); 91 ASSERT(credential->isPasswordCredential() || credential->isFederatedCred ential());
90 UseCounter::count(m_resolver->getScriptState()->getExecutionContext(), U seCounter::CredentialManagerGetReturnedCredential); 92 UseCounter::count(m_resolver->getScriptState()->getExecutionContext(), U seCounter::CredentialManagerGetReturnedCredential);
91 if (credential->isPasswordCredential()) 93 if (credential->isPasswordCredential())
92 m_resolver->resolve(PasswordCredential::create(static_cast<WebPasswo rdCredential*>(credential.get()))); 94 m_resolver->resolve(PasswordCredential::create(static_cast<WebPasswo rdCredential*>(credential.get())));
93 else 95 else
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 183 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
182 ScriptPromise promise = resolver->promise(); 184 ScriptPromise promise = resolver->promise();
183 if (!checkBoilerplate(resolver)) 185 if (!checkBoilerplate(resolver))
184 return promise; 186 return promise;
185 187
186 CredentialManagerClient::from(scriptState->getExecutionContext())->dispatchR equireUserMediation(new NotificationCallbacks(resolver)); 188 CredentialManagerClient::from(scriptState->getExecutionContext())->dispatchR equireUserMediation(new NotificationCallbacks(resolver));
187 return promise; 189 return promise;
188 } 190 }
189 191
190 } // namespace blink 192 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698