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

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

Issue 2884243003: Add a mojo channel for frame messages. (Closed)
Patch Set: Fix presubmit warning I ignored Created 3 years, 7 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #include "content/renderer/devtools/devtools_agent.h" 104 #include "content/renderer/devtools/devtools_agent.h"
105 #include "content/renderer/dom_automation_controller.h" 105 #include "content/renderer/dom_automation_controller.h"
106 #include "content/renderer/effective_connection_type_helper.h" 106 #include "content/renderer/effective_connection_type_helper.h"
107 #include "content/renderer/external_popup_menu.h" 107 #include "content/renderer/external_popup_menu.h"
108 #include "content/renderer/frame_owner_properties.h" 108 #include "content/renderer/frame_owner_properties.h"
109 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 109 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
110 #include "content/renderer/history_entry.h" 110 #include "content/renderer/history_entry.h"
111 #include "content/renderer/history_serialization.h" 111 #include "content/renderer/history_serialization.h"
112 #include "content/renderer/image_downloader/image_downloader_impl.h" 112 #include "content/renderer/image_downloader/image_downloader_impl.h"
113 #include "content/renderer/ime_event_guard.h" 113 #include "content/renderer/ime_event_guard.h"
114 #include "content/renderer/input/frame_input_handler_impl.h"
114 #include "content/renderer/input/input_handler_manager.h" 115 #include "content/renderer/input/input_handler_manager.h"
115 #include "content/renderer/installedapp/related_apps_fetcher.h" 116 #include "content/renderer/installedapp/related_apps_fetcher.h"
116 #include "content/renderer/internal_document_state_data.h" 117 #include "content/renderer/internal_document_state_data.h"
117 #include "content/renderer/manifest/manifest_manager.h" 118 #include "content/renderer/manifest/manifest_manager.h"
118 #include "content/renderer/media/audio_device_factory.h" 119 #include "content/renderer/media/audio_device_factory.h"
119 #include "content/renderer/media/media_devices_listener_impl.h" 120 #include "content/renderer/media/media_devices_listener_impl.h"
120 #include "content/renderer/media/media_permission_dispatcher.h" 121 #include "content/renderer/media/media_permission_dispatcher.h"
121 #include "content/renderer/media/media_stream_dispatcher.h" 122 #include "content/renderer/media/media_stream_dispatcher.h"
122 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 123 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
123 #include "content/renderer/media/render_media_log.h" 124 #include "content/renderer/media/render_media_log.h"
(...skipping 6826 matching lines...) Expand 10 before | Expand all | Expand 10 after
6950 } 6951 }
6951 #endif // ENABLE_PLUGINS 6952 #endif // ENABLE_PLUGINS
6952 6953
6953 void RenderFrameImpl::RegisterMojoInterfaces() { 6954 void RenderFrameImpl::RegisterMojoInterfaces() {
6954 GetAssociatedInterfaceRegistry()->AddInterface( 6955 GetAssociatedInterfaceRegistry()->AddInterface(
6955 base::Bind(&RenderFrameImpl::BindEngagement, weak_factory_.GetWeakPtr())); 6956 base::Bind(&RenderFrameImpl::BindEngagement, weak_factory_.GetWeakPtr()));
6956 6957
6957 GetAssociatedInterfaceRegistry()->AddInterface(base::Bind( 6958 GetAssociatedInterfaceRegistry()->AddInterface(base::Bind(
6958 &RenderFrameImpl::BindFrameBindingsControl, weak_factory_.GetWeakPtr())); 6959 &RenderFrameImpl::BindFrameBindingsControl, weak_factory_.GetWeakPtr()));
6959 6960
6961 GetInterfaceRegistry()->AddInterface(base::Bind(
6962 &FrameInputHandlerImpl::CreateMojoService, weak_factory_.GetWeakPtr()));
6963
6960 if (!frame_->Parent()) { 6964 if (!frame_->Parent()) {
6961 // Only main frame have ImageDownloader service. 6965 // Only main frame have ImageDownloader service.
6962 GetInterfaceRegistry()->AddInterface(base::Bind( 6966 GetInterfaceRegistry()->AddInterface(base::Bind(
6963 &ImageDownloaderImpl::CreateMojoService, base::Unretained(this))); 6967 &ImageDownloaderImpl::CreateMojoService, base::Unretained(this)));
6964 6968
6965 // Host zoom is per-page, so only added on the main frame. 6969 // Host zoom is per-page, so only added on the main frame.
6966 GetAssociatedInterfaceRegistry()->AddInterface(base::Bind( 6970 GetAssociatedInterfaceRegistry()->AddInterface(base::Bind(
6967 &RenderFrameImpl::OnHostZoomClientRequest, weak_factory_.GetWeakPtr())); 6971 &RenderFrameImpl::OnHostZoomClientRequest, weak_factory_.GetWeakPtr()));
6968 } 6972 }
6969 } 6973 }
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
7179 policy(info.default_policy), 7183 policy(info.default_policy),
7180 replaces_current_history_item(info.replaces_current_history_item), 7184 replaces_current_history_item(info.replaces_current_history_item),
7181 history_navigation_in_new_child_frame( 7185 history_navigation_in_new_child_frame(
7182 info.is_history_navigation_in_new_child_frame), 7186 info.is_history_navigation_in_new_child_frame),
7183 client_redirect(info.is_client_redirect), 7187 client_redirect(info.is_client_redirect),
7184 cache_disabled(info.is_cache_disabled), 7188 cache_disabled(info.is_cache_disabled),
7185 form(info.form), 7189 form(info.form),
7186 source_location(info.source_location) {} 7190 source_location(info.source_location) {}
7187 7191
7188 } // namespace content 7192 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698