| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 4972 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4983 #if defined(ENABLE_MOJO_MEDIA) | 4983 #if defined(ENABLE_MOJO_MEDIA) |
| 4984 media::interfaces::ServiceFactory* RenderFrameImpl::GetMediaServiceFactory() { | 4984 media::interfaces::ServiceFactory* RenderFrameImpl::GetMediaServiceFactory() { |
| 4985 if (!media_service_factory_) { | 4985 if (!media_service_factory_) { |
| 4986 mojo::InterfacePtr<mojo::Shell> shell_ptr; | 4986 mojo::InterfacePtr<mojo::Shell> shell_ptr; |
| 4987 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&shell_ptr)); | 4987 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&shell_ptr)); |
| 4988 | 4988 |
| 4989 mojo::ServiceProviderPtr service_provider; | 4989 mojo::ServiceProviderPtr service_provider; |
| 4990 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 4990 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
| 4991 request->url = mojo::String::From("mojo:media"); | 4991 request->url = mojo::String::From("mojo:media"); |
| 4992 shell_ptr->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 4992 shell_ptr->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
| 4993 nullptr); | 4993 nullptr, nullptr); |
| 4994 | 4994 |
| 4995 mojo::ConnectToService(service_provider.get(), &media_service_factory_); | 4995 mojo::ConnectToService(service_provider.get(), &media_service_factory_); |
| 4996 | 4996 |
| 4997 media_service_factory_.set_connection_error_handler( | 4997 media_service_factory_.set_connection_error_handler( |
| 4998 base::Bind(&RenderFrameImpl::OnMediaServiceFactoryConnectionError, | 4998 base::Bind(&RenderFrameImpl::OnMediaServiceFactoryConnectionError, |
| 4999 base::Unretained(this))); | 4999 base::Unretained(this))); |
| 5000 } | 5000 } |
| 5001 | 5001 |
| 5002 return media_service_factory_.get(); | 5002 return media_service_factory_.get(); |
| 5003 } | 5003 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5049 void RenderFrameImpl::RegisterMojoServices() { | 5049 void RenderFrameImpl::RegisterMojoServices() { |
| 5050 // Only main frame have ImageDownloader service. | 5050 // Only main frame have ImageDownloader service. |
| 5051 if (!frame_->parent()) { | 5051 if (!frame_->parent()) { |
| 5052 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( | 5052 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
| 5053 base::Bind(&ImageDownloaderImpl::CreateMojoService, | 5053 base::Bind(&ImageDownloaderImpl::CreateMojoService, |
| 5054 base::Unretained(this))); | 5054 base::Unretained(this))); |
| 5055 } | 5055 } |
| 5056 } | 5056 } |
| 5057 | 5057 |
| 5058 } // namespace content | 5058 } // namespace content |
| OLD | NEW |