content/browser/frame_host/render_frame_host_impl.cc - Issue 1831173002: Scaffolding for Android implementation of PaymentRequest.

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: content/browser/frame_host/render_frame_host_impl.cc

Issue 1831173002: Scaffolding for Android implementation of PaymentRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo

Patch Set: Fix shell_mojo_test_utils_android.cc 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

« content/browser/android/service_registry_android_impl.cc ('K') | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/mojo/mojo_application_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_impl.cc

diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc

index 1b0946ed27a3be5f7a206ee54f60ed6e959bd417..d6083d59cd73bdc3a1a37ced9b014b380d442065 100644

--- a/content/browser/frame_host/render_frame_host_impl.cc

+++ b/content/browser/frame_host/render_frame_host_impl.cc

@@ -2255,8 +2255,8 @@ void RenderFrameHostImpl::SetUpMojoIfNeeded() {

service_registry_->BindRemoteServiceProvider(std::move(services));

#if defined(OS_ANDROID)

- service_registry_android_.reset(

- new ServiceRegistryAndroid(service_registry_.get()));

+ service_registry_android_ =

+ ServiceRegistryAndroid::Create(service_registry_.get());

ServiceRegistrarAndroid::RegisterFrameHostServices(

service_registry_android_.get());

#endif