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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2166953006: Eliminate FrameMojoShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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') | services/shell/public/cpp/connection.h » ('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 d2030c35e017a83ed17e6526dbb2907d173b90c1..de5a8905316f8cee5c3e9235f7fbe44b8d4641b3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -684,10 +684,6 @@ WebFrameLoadType ReloadFrameLoadTypeFor(
RenderFrameImpl::CreateRenderFrameImplFunction g_create_render_frame_impl =
nullptr;
-void OnGotInstanceID(shell::mojom::ConnectResult result,
- mojo::String user_id,
- uint32_t instance_id) {}
-
WebString ConvertRelativePathToHtmlAttribute(const base::FilePath& path) {
DCHECK(!path.IsAbsolute());
return WebString::fromUTF8(
@@ -6134,8 +6130,8 @@ media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
#if defined(ENABLE_MOJO_MEDIA)
shell::mojom::InterfaceProvider* RenderFrameImpl::GetMediaInterfaceProvider() {
if (!media_interface_provider_) {
- media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind(
- &RenderFrameImpl::ConnectToApplication, base::Unretained(this))));
+ media_interface_provider_.reset(
+ new MediaInterfaceProvider(GetRemoteInterfaces()));
}
return media_interface_provider_.get();
@@ -6199,20 +6195,6 @@ void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) {
GetRemoteInterfaces()->GetInterface(std::move(request));
}
-shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
- const GURL& url) {
- if (!connector_)
- GetRemoteInterfaces()->GetInterface(&connector_);
- shell::mojom::InterfaceProviderPtr interface_provider;
- shell::mojom::IdentityPtr target(shell::mojom::Identity::New());
- target->name = url.spec();
- target->user_id = shell::mojom::kInheritUserID;
- target->instance = "";
- connector_->Connect(std::move(target), GetProxy(&interface_provider), nullptr,
- nullptr, base::Bind(&OnGotInstanceID));
- return interface_provider;
-}
-
media::RendererWebMediaPlayerDelegate*
RenderFrameImpl::GetWebMediaPlayerDelegate() {
if (!media_player_delegate_)
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | services/shell/public/cpp/connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698