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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1085783002: Replace image_messages.h with Mojo service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix review comments on set7 Created 5 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 unified diff | Download patch
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "content/renderer/child_frame_compositing_helper.h" 65 #include "content/renderer/child_frame_compositing_helper.h"
66 #include "content/renderer/context_menu_params_builder.h" 66 #include "content/renderer/context_menu_params_builder.h"
67 #include "content/renderer/devtools/devtools_agent.h" 67 #include "content/renderer/devtools/devtools_agent.h"
68 #include "content/renderer/dom_automation_controller.h" 68 #include "content/renderer/dom_automation_controller.h"
69 #include "content/renderer/dom_utils.h" 69 #include "content/renderer/dom_utils.h"
70 #include "content/renderer/external_popup_menu.h" 70 #include "content/renderer/external_popup_menu.h"
71 #include "content/renderer/geolocation_dispatcher.h" 71 #include "content/renderer/geolocation_dispatcher.h"
72 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 72 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
73 #include "content/renderer/history_controller.h" 73 #include "content/renderer/history_controller.h"
74 #include "content/renderer/history_serialization.h" 74 #include "content/renderer/history_serialization.h"
75 #include "content/renderer/image_loading_helper.h" 75 #include "content/renderer/image_downloader/image_downloader_impl.h"
76 #include "content/renderer/ime_event_guard.h" 76 #include "content/renderer/ime_event_guard.h"
77 #include "content/renderer/internal_document_state_data.h" 77 #include "content/renderer/internal_document_state_data.h"
78 #include "content/renderer/manifest/manifest_manager.h" 78 #include "content/renderer/manifest/manifest_manager.h"
79 #include "content/renderer/media/audio_renderer_mixer_manager.h" 79 #include "content/renderer/media/audio_renderer_mixer_manager.h"
80 #include "content/renderer/media/crypto/render_cdm_factory.h" 80 #include "content/renderer/media/crypto/render_cdm_factory.h"
81 #include "content/renderer/media/media_permission_dispatcher.h" 81 #include "content/renderer/media/media_permission_dispatcher.h"
82 #include "content/renderer/media/media_stream_dispatcher.h" 82 #include "content/renderer/media/media_stream_dispatcher.h"
83 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 83 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
84 #include "content/renderer/media/midi_dispatcher.h" 84 #include "content/renderer/media/midi_dispatcher.h"
85 #include "content/renderer/media/render_media_log.h" 85 #include "content/renderer/media/render_media_log.h"
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 734
735 void RenderFrameImpl::Initialize() { 735 void RenderFrameImpl::Initialize() {
736 is_subframe_ = !!frame_->parent(); 736 is_subframe_ = !!frame_->parent();
737 is_local_root_ = !frame_->parent() || frame_->parent()->isWebRemoteFrame(); 737 is_local_root_ = !frame_->parent() || frame_->parent()->isWebRemoteFrame();
738 738
739 #if defined(ENABLE_PLUGINS) 739 #if defined(ENABLE_PLUGINS)
740 new PepperBrowserConnection(this); 740 new PepperBrowserConnection(this);
741 #endif 741 #endif
742 new SharedWorkerRepository(this); 742 new SharedWorkerRepository(this);
743 743
744 if (!frame_->parent())
745 new ImageLoadingHelper(this);
746
747 if (is_local_root_ && !render_frame_proxy_) { 744 if (is_local_root_ && !render_frame_proxy_) {
748 // DevToolsAgent is a RenderFrameObserver, and will destruct itself 745 // DevToolsAgent is a RenderFrameObserver, and will destruct itself
749 // when |this| is deleted. 746 // when |this| is deleted.
750 devtools_agent_ = new DevToolsAgent(this); 747 devtools_agent_ = new DevToolsAgent(this);
751 } 748 }
752 749
750 RegisterMojoServices();
751
753 // We delay calling this until we have the WebFrame so that any observer or 752 // We delay calling this until we have the WebFrame so that any observer or
754 // embedder can call GetWebFrame on any RenderFrame. 753 // embedder can call GetWebFrame on any RenderFrame.
755 GetContentClient()->renderer()->RenderFrameCreated(this); 754 GetContentClient()->renderer()->RenderFrameCreated(this);
756 } 755 }
757 756
758 RenderWidget* RenderFrameImpl::GetRenderWidget() { 757 RenderWidget* RenderFrameImpl::GetRenderWidget() {
759 return render_view_.get(); 758 return render_view_.get();
760 } 759 }
761 760
762 #if defined(ENABLE_PLUGINS) 761 #if defined(ENABLE_PLUGINS)
(...skipping 4238 matching lines...) Expand 10 before | Expand all | Expand 10 after
5001 #elif defined(ENABLE_BROWSER_CDMS) 5000 #elif defined(ENABLE_BROWSER_CDMS)
5002 cdm_manager_ 5001 cdm_manager_
5003 #endif 5002 #endif
5004 )); 5003 ));
5005 #endif // defined(ENABLE_MOJO_MEDIA) 5004 #endif // defined(ENABLE_MOJO_MEDIA)
5006 } 5005 }
5007 5006
5008 return cdm_factory_.get(); 5007 return cdm_factory_.get();
5009 } 5008 }
5010 5009
5010 void RenderFrameImpl::RegisterMojoServices() {
5011 // Only main frame have ImageDownloader service.
5012 if (!frame_->parent()) {
5013 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5014 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5015 base::Unretained(this)));
5016 }
5017 }
5018
5011 } // namespace content 5019 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698