third_party/WebKit/Source/modules/payments/PaymentRequest.cpp - Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/modules/notifications/NotificationManager.cpp ('K') | « third_party/WebKit/Source/modules/notifications/NotificationManager.cpp ('k') | third_party/WebKit/Source/modules/permissions/Permissions.cpp » ('j') | third_party/WebKit/public/platform/InterfaceProvider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

index 697077558264391a19d958fd976005c5a4c77195..6c71ecfb2bd6bae3b8331e9fe52c703ce5bdbb91 100644

--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

@@ -24,7 +24,7 @@

#include "mojo/public/cpp/bindings/interface_request.h"

#include "mojo/public/cpp/bindings/wtf_array.h"

#include "platform/mojo/MojoHelper.h"

-#include "public/platform/ServiceRegistry.h"

+#include "public/platform/InterfaceProvider.h"

#include "wtf/HashSet.h"

#include <utility>

@@ -381,7 +381,7 @@ ScriptPromise PaymentRequest::show(ScriptState* scriptState)

return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Cannot show the payment request"));

DCHECK(!m_paymentProvider.is_bound());

- scriptState->domWindow()->frame()->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_paymentProvider));

+ scriptState->domWindow()->frame()->interfaceProvider()->getInterface(mojo::GetProxy(&m_paymentProvider));

m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this), mojom::blink::PaymentErrorReason::UNKNOWN)));

m_paymentProvider->SetClient(m_clientBinding.CreateInterfacePtrAndBind());

m_paymentProvider->Show(mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(m_methodData), mojom::blink::PaymentDetails::From(m_details), mojom::blink::PaymentOptions::From(m_options));