Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 93029e3f14a69e9a308fdcc205568f9ac5cfa18c..64cf754098e46d724f40a016d6792fc8ad6a93b6 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -70,7 +70,7 @@ |
#include "content/renderer/gpu/gpu_benchmarking_extension.h" |
#include "content/renderer/history_controller.h" |
#include "content/renderer/history_serialization.h" |
-#include "content/renderer/image_loading_helper.h" |
+#include "content/renderer/image_downloader/image_downloader_impl.h" |
#include "content/renderer/ime_event_guard.h" |
#include "content/renderer/internal_document_state_data.h" |
#include "content/renderer/manifest/manifest_manager.h" |
@@ -746,15 +746,14 @@ void RenderFrameImpl::Initialize() { |
#endif |
new SharedWorkerRepository(this); |
- if (!frame_->parent()) |
- new ImageLoadingHelper(this); |
- |
if (is_local_root_ && !render_frame_proxy_) { |
// DevToolsAgent is a RenderFrameObserver, and will destruct itself |
// when |this| is deleted. |
devtools_agent_ = new DevToolsAgent(this); |
} |
+ RegisterMojoServices(); |
+ |
// We delay calling this until we have the WebFrame so that any observer or |
// embedder can call GetWebFrame on any RenderFrame. |
GetContentClient()->renderer()->RenderFrameCreated(this); |
@@ -4788,4 +4787,12 @@ media::CdmFactory* RenderFrameImpl::GetCdmFactory() { |
return cdm_factory_; |
} |
+void RenderFrameImpl::RegisterMojoServices() { |
+ // only main frame have ImageDownloader service |
nasko
2015/04/15 20:57:22
nit: Capitalize "only" and end with a period.
leonhsl(Using Gerrit)
2015/04/17 06:14:34
Done.
|
+ if (!frame_->parent()) |
nasko
2015/04/15 20:57:22
If statements with body longer than one line requi
leonhsl(Using Gerrit)
2015/04/17 06:14:34
Done.
|
+ GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
+ base::Bind(&ImageDownloaderImpl::CreateMojoService, |
+ base::Unretained(this))); |
+} |
+ |
} // namespace content |