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

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: resolve review comments Created 5 years, 6 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 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 719
720 void RenderFrameImpl::Initialize() { 720 void RenderFrameImpl::Initialize() {
721 is_subframe_ = !!frame_->parent(); 721 is_subframe_ = !!frame_->parent();
722 is_local_root_ = !frame_->parent() || frame_->parent()->isWebRemoteFrame(); 722 is_local_root_ = !frame_->parent() || frame_->parent()->isWebRemoteFrame();
723 723
724 #if defined(ENABLE_PLUGINS) 724 #if defined(ENABLE_PLUGINS)
725 new PepperBrowserConnection(this); 725 new PepperBrowserConnection(this);
726 #endif 726 #endif
727 new SharedWorkerRepository(this); 727 new SharedWorkerRepository(this);
728 728
729 if (!frame_->parent())
730 new ImageLoadingHelper(this);
731
732 if (is_local_root_ && !render_frame_proxy_) { 729 if (is_local_root_ && !render_frame_proxy_) {
733 // DevToolsAgent is a RenderFrameObserver, and will destruct itself 730 // DevToolsAgent is a RenderFrameObserver, and will destruct itself
734 // when |this| is deleted. 731 // when |this| is deleted.
735 devtools_agent_ = new DevToolsAgent(this); 732 devtools_agent_ = new DevToolsAgent(this);
736 } 733 }
737 734
735 RegisterMojoServices();
736
738 // We delay calling this until we have the WebFrame so that any observer or 737 // We delay calling this until we have the WebFrame so that any observer or
739 // embedder can call GetWebFrame on any RenderFrame. 738 // embedder can call GetWebFrame on any RenderFrame.
740 GetContentClient()->renderer()->RenderFrameCreated(this); 739 GetContentClient()->renderer()->RenderFrameCreated(this);
741 } 740 }
742 741
743 RenderWidget* RenderFrameImpl::GetRenderWidget() { 742 RenderWidget* RenderFrameImpl::GetRenderWidget() {
744 return render_view_.get(); 743 return render_view_.get();
745 } 744 }
746 745
747 #if defined(ENABLE_PLUGINS) 746 #if defined(ENABLE_PLUGINS)
(...skipping 4175 matching lines...) Expand 10 before | Expand all | Expand 10 after
4923 base::Bind(&PepperCdmWrapperImpl::Create, frame_), 4922 base::Bind(&PepperCdmWrapperImpl::Create, frame_),
4924 #elif defined(ENABLE_BROWSER_CDMS) 4923 #elif defined(ENABLE_BROWSER_CDMS)
4925 cdm_manager_, 4924 cdm_manager_,
4926 #endif 4925 #endif
4927 this); 4926 this);
4928 } 4927 }
4929 4928
4930 return cdm_factory_; 4929 return cdm_factory_;
4931 } 4930 }
4932 4931
4932 void RenderFrameImpl::RegisterMojoServices() {
4933 // Only main frame have ImageDownloader service.
4934 if (!frame_->parent()) {
4935 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
4936 base::Bind(&ImageDownloaderImpl::CreateMojoService,
4937 base::Unretained(this)));
4938 }
4939 }
4940
4933 } // namespace content 4941 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698