OLD | NEW |
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 #include "content/renderer/media/media_stream_renderer_factory_impl.h" | 101 #include "content/renderer/media/media_stream_renderer_factory_impl.h" |
102 #include "content/renderer/media/midi_dispatcher.h" | 102 #include "content/renderer/media/midi_dispatcher.h" |
103 #include "content/renderer/media/render_media_log.h" | 103 #include "content/renderer/media/render_media_log.h" |
104 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" | 104 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" |
105 #include "content/renderer/media/user_media_client_impl.h" | 105 #include "content/renderer/media/user_media_client_impl.h" |
106 #include "content/renderer/media/webmediaplayer_ms.h" | 106 #include "content/renderer/media/webmediaplayer_ms.h" |
107 #include "content/renderer/mojo/service_registry_js_wrapper.h" | 107 #include "content/renderer/mojo/service_registry_js_wrapper.h" |
108 #include "content/renderer/mojo_bindings_controller.h" | 108 #include "content/renderer/mojo_bindings_controller.h" |
109 #include "content/renderer/navigation_state_impl.h" | 109 #include "content/renderer/navigation_state_impl.h" |
110 #include "content/renderer/notification_permission_dispatcher.h" | 110 #include "content/renderer/notification_permission_dispatcher.h" |
111 #include "content/renderer/npapi/plugin_channel_host.h" | |
112 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" | 111 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" |
113 #include "content/renderer/presentation/presentation_dispatcher.h" | 112 #include "content/renderer/presentation/presentation_dispatcher.h" |
114 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" | 113 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" |
115 #include "content/renderer/render_frame_proxy.h" | 114 #include "content/renderer/render_frame_proxy.h" |
116 #include "content/renderer/render_process.h" | 115 #include "content/renderer/render_process.h" |
117 #include "content/renderer/render_thread_impl.h" | 116 #include "content/renderer/render_thread_impl.h" |
118 #include "content/renderer/render_view_impl.h" | 117 #include "content/renderer/render_view_impl.h" |
119 #include "content/renderer/render_widget_fullscreen_pepper.h" | 118 #include "content/renderer/render_widget_fullscreen_pepper.h" |
120 #include "content/renderer/renderer_webapplicationcachehost_impl.h" | 119 #include "content/renderer/renderer_webapplicationcachehost_impl.h" |
121 #include "content/renderer/renderer_webcolorchooser_impl.h" | 120 #include "content/renderer/renderer_webcolorchooser_impl.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 178 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
180 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" | 179 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" |
181 #include "third_party/WebKit/public/web/WebSettings.h" | 180 #include "third_party/WebKit/public/web/WebSettings.h" |
182 #include "third_party/WebKit/public/web/WebSurroundingText.h" | 181 #include "third_party/WebKit/public/web/WebSurroundingText.h" |
183 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | 182 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
184 #include "third_party/WebKit/public/web/WebView.h" | 183 #include "third_party/WebKit/public/web/WebView.h" |
185 #include "url/url_constants.h" | 184 #include "url/url_constants.h" |
186 #include "url/url_util.h" | 185 #include "url/url_util.h" |
187 | 186 |
188 #if defined(ENABLE_PLUGINS) | 187 #if defined(ENABLE_PLUGINS) |
189 #include "content/renderer/npapi/webplugin_impl.h" | |
190 #include "content/renderer/pepper/pepper_browser_connection.h" | 188 #include "content/renderer/pepper/pepper_browser_connection.h" |
191 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" | 189 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
192 #include "content/renderer/pepper/pepper_webplugin_impl.h" | 190 #include "content/renderer/pepper/pepper_webplugin_impl.h" |
193 #include "content/renderer/pepper/plugin_module.h" | 191 #include "content/renderer/pepper/plugin_module.h" |
194 #endif | 192 #endif |
195 | 193 |
196 #if defined(ENABLE_WEBRTC) | 194 #if defined(ENABLE_WEBRTC) |
197 #include "content/renderer/media/rtc_peer_connection_handler.h" | 195 #include "content/renderer/media/rtc_peer_connection_handler.h" |
198 #endif | 196 #endif |
199 | 197 |
(...skipping 2051 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2251 if (pepper_plugin_was_registered) { | 2249 if (pepper_plugin_was_registered) { |
2252 if (pepper_module.get()) { | 2250 if (pepper_module.get()) { |
2253 return new PepperWebPluginImpl( | 2251 return new PepperWebPluginImpl( |
2254 pepper_module.get(), params, this, | 2252 pepper_module.get(), params, this, |
2255 make_scoped_ptr( | 2253 make_scoped_ptr( |
2256 static_cast<PluginInstanceThrottlerImpl*>(throttler.release()))); | 2254 static_cast<PluginInstanceThrottlerImpl*>(throttler.release()))); |
2257 } | 2255 } |
2258 } | 2256 } |
2259 #if defined(OS_CHROMEOS) | 2257 #if defined(OS_CHROMEOS) |
2260 LOG(WARNING) << "Pepper module/plugin creation failed."; | 2258 LOG(WARNING) << "Pepper module/plugin creation failed."; |
2261 #else | |
2262 if (info.type == WebPluginInfo::PLUGIN_TYPE_NPAPI) { | |
2263 // TODO(jam): change to take RenderFrame. | |
2264 return new WebPluginImpl(frame, params, info.path, render_view_, this); | |
2265 } | |
2266 #endif | 2259 #endif |
2267 #endif | 2260 #endif |
2268 return NULL; | 2261 return NULL; |
2269 } | 2262 } |
2270 | 2263 |
2271 void RenderFrameImpl::LoadURLExternally(const blink::WebURLRequest& request, | 2264 void RenderFrameImpl::LoadURLExternally(const blink::WebURLRequest& request, |
2272 blink::WebNavigationPolicy policy) { | 2265 blink::WebNavigationPolicy policy) { |
2273 loadURLExternally(request, policy, WebString(), false); | 2266 loadURLExternally(request, policy, WebString(), false); |
2274 } | 2267 } |
2275 | 2268 |
(...skipping 3756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6032 int match_count, | 6025 int match_count, |
6033 int ordinal, | 6026 int ordinal, |
6034 const WebRect& selection_rect, | 6027 const WebRect& selection_rect, |
6035 bool final_status_update) { | 6028 bool final_status_update) { |
6036 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6029 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6037 selection_rect, ordinal, | 6030 selection_rect, ordinal, |
6038 final_status_update)); | 6031 final_status_update)); |
6039 } | 6032 } |
6040 | 6033 |
6041 } // namespace content | 6034 } // namespace content |
OLD | NEW |