Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3379)

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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/data/web_ui_mojo_shell_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 689e5bea02ec7a1705fec1795361118b3877ca9f..6c1b26965b6b48553cca3e65d9629d8b7ef66b5a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6070,12 +6070,10 @@ void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) {
mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
const GURL& url) {
- if (!mojo_shell_)
- GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
+ if (!connector_)
+ GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&connector_));
mojo::shell::mojom::InterfaceProviderPtr interface_provider;
- mojo::shell::mojom::ConnectorPtr connector;
- mojo_shell_->GetConnector(GetProxy(&connector));
- connector->Connect(
+ connector_->Connect(
url.spec(), mojo::shell::mojom::Connector::kUserInherit,
GetProxy(&interface_provider), nullptr, base::Bind(&OnGotInstanceID));
return interface_provider;
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/data/web_ui_mojo_shell_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698