content/browser/frame_host/render_frame_host_impl.cc - Issue 1736663003: Eliminate Quit() from Shell, and roll Shell & Connector together.

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 1736663003: Eliminate Quit() from Shell, and roll Shell & Connector together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@14cf

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

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 188d17aa0ca0c565ff027ece42dc20d770271c51..7cd72e7e7d9ee5c03b9ffcc1e61fa443ee6df3d3 100644

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

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

@@ -1835,7 +1835,7 @@ void RenderFrameHostImpl::RegisterMojoServices() {

if (!frame_mojo_shell_)

frame_mojo_shell_.reset(new FrameMojoShell(this));

- GetServiceRegistry()->AddService<mojo::shell::mojom::Shell>(base::Bind(

+ GetServiceRegistry()->AddService<mojo::shell::mojom::Connector>(base::Bind(

&FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get())));

#if defined(ENABLE_WEBVR)

« no previous file with comments | « content/browser/frame_host/frame_mojo_shell.cc ('k') | content/renderer/render_frame_impl.h » ('j') | content/renderer/render_frame_impl.h » ('J')