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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/renderer/render_thread_impl.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 bb2156a285c74eaaef452b2e81c7f5b534d43756..8902cdf3f32a0fcc86730b17a06b5e35791192d6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1497,8 +1497,8 @@ void RenderFrameImpl::NavigateToSwappedOutURL() {
}
void RenderFrameImpl::BindServiceRegistry(
- mojo::InterfaceRequest<mojo::InterfaceProvider> services,
- mojo::InterfaceProviderPtr exposed_services) {
+ mojo::shell::mojom::InterfaceProviderRequest services,
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services) {
service_registry_.Bind(std::move(services));
service_registry_.BindRemoteServiceProvider(std::move(exposed_services));
}
@@ -6004,7 +6004,7 @@ media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
#if defined(ENABLE_MOJO_MEDIA)
media::interfaces::ServiceFactory* RenderFrameImpl::GetMediaServiceFactory() {
if (!media_service_factory_) {
- mojo::InterfaceProviderPtr service_provider =
+ mojo::shell::mojom::InterfaceProviderPtr service_provider =
ConnectToApplication(GURL("mojo:media"));
mojo::GetInterface(service_provider.get(), &media_service_factory_);
media_service_factory_.set_connection_error_handler(
@@ -6073,11 +6073,11 @@ void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) {
GetServiceRegistry()->ConnectToRemoteService(std::move(request));
}
-mojo::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
+mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
const GURL& url) {
if (!mojo_shell_)
GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
- mojo::InterfaceProviderPtr service_provider;
+ mojo::shell::mojom::InterfaceProviderPtr service_provider;
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From(url);
mojo::shell::mojom::CapabilityFilterPtr filter(
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698