content/renderer/render_frame_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/renderer/render_frame_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

« content/renderer/render_frame_impl.h ('K') | « content/renderer/render_frame_impl.h ('k') | content/test/data/web_ui_mojo_shell_test.js » ('j') | mojo/shell/public/cpp/lib/shell_connection.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 94afb7ca186fadc1e7e747c0309d19f6baf8a7bb..ed59190b4d59c314d4e2c4efba2951e6ebd0cfda 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -6074,9 +6074,7 @@ mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(

if (!mojo_shell_)

GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));

mojo::shell::mojom::InterfaceProviderPtr interface_provider;

- mojo::shell::mojom::ConnectorPtr connector;

- mojo_shell_->GetConnector(GetProxy(&connector));

- connector->Connect(

+ mojo_shell_->Connect(

url.spec(), mojo::shell::mojom::Connector::kUserInherit,

GetProxy(&interface_provider), nullptr, base::Bind(&OnGotInstanceID));

return interface_provider;