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

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: Created 5 years, 8 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "content/renderer/child_frame_compositing_helper.h" 63 #include "content/renderer/child_frame_compositing_helper.h"
64 #include "content/renderer/context_menu_params_builder.h" 64 #include "content/renderer/context_menu_params_builder.h"
65 #include "content/renderer/devtools/devtools_agent.h" 65 #include "content/renderer/devtools/devtools_agent.h"
66 #include "content/renderer/dom_automation_controller.h" 66 #include "content/renderer/dom_automation_controller.h"
67 #include "content/renderer/dom_utils.h" 67 #include "content/renderer/dom_utils.h"
68 #include "content/renderer/external_popup_menu.h" 68 #include "content/renderer/external_popup_menu.h"
69 #include "content/renderer/geolocation_dispatcher.h" 69 #include "content/renderer/geolocation_dispatcher.h"
70 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 70 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
71 #include "content/renderer/history_controller.h" 71 #include "content/renderer/history_controller.h"
72 #include "content/renderer/history_serialization.h" 72 #include "content/renderer/history_serialization.h"
73 #include "content/renderer/image_loading_helper.h" 73 #include "content/renderer/image_downloader/image_downloader_impl.h"
74 #include "content/renderer/ime_event_guard.h" 74 #include "content/renderer/ime_event_guard.h"
75 #include "content/renderer/internal_document_state_data.h" 75 #include "content/renderer/internal_document_state_data.h"
76 #include "content/renderer/manifest/manifest_manager.h" 76 #include "content/renderer/manifest/manifest_manager.h"
77 #include "content/renderer/media/audio_renderer_mixer_manager.h" 77 #include "content/renderer/media/audio_renderer_mixer_manager.h"
78 #include "content/renderer/media/crypto/render_cdm_factory.h" 78 #include "content/renderer/media/crypto/render_cdm_factory.h"
79 #include "content/renderer/media/media_permission_dispatcher.h" 79 #include "content/renderer/media/media_permission_dispatcher.h"
80 #include "content/renderer/media/media_stream_dispatcher.h" 80 #include "content/renderer/media/media_stream_dispatcher.h"
81 #include "content/renderer/media/media_stream_renderer_factory.h" 81 #include "content/renderer/media/media_stream_renderer_factory.h"
82 #include "content/renderer/media/midi_dispatcher.h" 82 #include "content/renderer/media/midi_dispatcher.h"
83 #include "content/renderer/media/render_media_log.h" 83 #include "content/renderer/media/render_media_log.h"
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 } 739 }
740 740
741 void RenderFrameImpl::Initialize() { 741 void RenderFrameImpl::Initialize() {
742 is_local_root_ = !frame_->parent() || frame_->parent()->isWebRemoteFrame(); 742 is_local_root_ = !frame_->parent() || frame_->parent()->isWebRemoteFrame();
743 743
744 #if defined(ENABLE_PLUGINS) 744 #if defined(ENABLE_PLUGINS)
745 new PepperBrowserConnection(this); 745 new PepperBrowserConnection(this);
746 #endif 746 #endif
747 new SharedWorkerRepository(this); 747 new SharedWorkerRepository(this);
748 748
749 if (!frame_->parent())
750 new ImageLoadingHelper(this);
751
752 if (is_local_root_ && !render_frame_proxy_) { 749 if (is_local_root_ && !render_frame_proxy_) {
753 // DevToolsAgent is a RenderFrameObserver, and will destruct itself 750 // DevToolsAgent is a RenderFrameObserver, and will destruct itself
754 // when |this| is deleted. 751 // when |this| is deleted.
755 devtools_agent_ = new DevToolsAgent(this); 752 devtools_agent_ = new DevToolsAgent(this);
756 } 753 }
757 754
755 RegisterMojoServices();
756
758 // We delay calling this until we have the WebFrame so that any observer or 757 // We delay calling this until we have the WebFrame so that any observer or
759 // embedder can call GetWebFrame on any RenderFrame. 758 // embedder can call GetWebFrame on any RenderFrame.
760 GetContentClient()->renderer()->RenderFrameCreated(this); 759 GetContentClient()->renderer()->RenderFrameCreated(this);
761 } 760 }
762 761
763 RenderWidget* RenderFrameImpl::GetRenderWidget() { 762 RenderWidget* RenderFrameImpl::GetRenderWidget() {
764 return render_view_.get(); 763 return render_view_.get();
765 } 764 }
766 765
767 #if defined(ENABLE_PLUGINS) 766 #if defined(ENABLE_PLUGINS)
(...skipping 4013 matching lines...) Expand 10 before | Expand all | Expand 10 after
4781 base::Bind(&PepperCdmWrapperImpl::Create, frame_), 4780 base::Bind(&PepperCdmWrapperImpl::Create, frame_),
4782 #elif defined(ENABLE_BROWSER_CDMS) 4781 #elif defined(ENABLE_BROWSER_CDMS)
4783 cdm_manager_, 4782 cdm_manager_,
4784 #endif 4783 #endif
4785 this); 4784 this);
4786 } 4785 }
4787 4786
4788 return cdm_factory_; 4787 return cdm_factory_;
4789 } 4788 }
4790 4789
4790 void RenderFrameImpl::RegisterMojoServices() {
4791 // 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.
4792 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.
4793 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
4794 base::Bind(&ImageDownloaderImpl::CreateMojoService,
4795 base::Unretained(this)));
4796 }
4797
4791 } // namespace content 4798 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698