third_party/WebKit/Source/modules/payments/PaymentRequest.cpp - Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform.

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 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« no previous file with comments | « third_party/WebKit/Source/modules/battery/BatteryDispatcher.cpp ('k') | third_party/WebKit/Source/platform/blink_platform.gypi » ('j') | no next file with comments »
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 83524fb8a1dd15b73b03cbe9e100a3d91db532c5..36d00e91a620729c6f6657a635ceca6a94c3e103 100644

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

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

@@ -23,6 +23,7 @@

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

#include "platform/MojoHelper.h"

#include "public/platform/Platform.h"

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

#include <utility>

namespace mojo {

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

return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Already called show() once"));

DCHECK(!m_paymentProvider.is_bound());

- blink::Platform::current()->connectToRemoteService(mojo::GetProxy(&m_paymentProvider));

+ blink::Platform::current()->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_paymentProvider));

m_paymentProvider.set_connection_error_handler(sameThreadBindForMojo(&PaymentRequest::OnError, this));

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

m_paymentProvider->Show(std::move(m_supportedMethods), mojom::wtf::PaymentDetails::From(m_details), mojom::wtf::PaymentOptions::From(m_options), m_stringifiedData.isNull() ? "" : m_stringifiedData);