| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 179 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
| 181 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" | 180 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" |
| 182 #include "third_party/WebKit/public/web/WebSettings.h" | 181 #include "third_party/WebKit/public/web/WebSettings.h" |
| 183 #include "third_party/WebKit/public/web/WebSurroundingText.h" | 182 #include "third_party/WebKit/public/web/WebSurroundingText.h" |
| 184 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | 183 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
| 185 #include "third_party/WebKit/public/web/WebView.h" | 184 #include "third_party/WebKit/public/web/WebView.h" |
| 186 #include "url/url_constants.h" | 185 #include "url/url_constants.h" |
| 187 #include "url/url_util.h" | 186 #include "url/url_util.h" |
| 188 | 187 |
| 189 #if defined(ENABLE_PLUGINS) | 188 #if defined(ENABLE_PLUGINS) |
| 190 #include "content/renderer/npapi/webplugin_impl.h" | |
| 191 #include "content/renderer/pepper/pepper_browser_connection.h" | 189 #include "content/renderer/pepper/pepper_browser_connection.h" |
| 192 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" | 190 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
| 193 #include "content/renderer/pepper/pepper_webplugin_impl.h" | 191 #include "content/renderer/pepper/pepper_webplugin_impl.h" |
| 194 #include "content/renderer/pepper/plugin_module.h" | 192 #include "content/renderer/pepper/plugin_module.h" |
| 195 #endif | 193 #endif |
| 196 | 194 |
| 197 #if defined(ENABLE_WEBRTC) | 195 #if defined(ENABLE_WEBRTC) |
| 198 #include "content/renderer/media/rtc_peer_connection_handler.h" | 196 #include "content/renderer/media/rtc_peer_connection_handler.h" |
| 199 #endif | 197 #endif |
| 200 | 198 |
| (...skipping 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2256 if (pepper_plugin_was_registered) { | 2254 if (pepper_plugin_was_registered) { |
| 2257 if (pepper_module.get()) { | 2255 if (pepper_module.get()) { |
| 2258 return new PepperWebPluginImpl( | 2256 return new PepperWebPluginImpl( |
| 2259 pepper_module.get(), params, this, | 2257 pepper_module.get(), params, this, |
| 2260 make_scoped_ptr( | 2258 make_scoped_ptr( |
| 2261 static_cast<PluginInstanceThrottlerImpl*>(throttler.release()))); | 2259 static_cast<PluginInstanceThrottlerImpl*>(throttler.release()))); |
| 2262 } | 2260 } |
| 2263 } | 2261 } |
| 2264 #if defined(OS_CHROMEOS) | 2262 #if defined(OS_CHROMEOS) |
| 2265 LOG(WARNING) << "Pepper module/plugin creation failed."; | 2263 LOG(WARNING) << "Pepper module/plugin creation failed."; |
| 2266 #else | |
| 2267 if (info.type == WebPluginInfo::PLUGIN_TYPE_NPAPI) { | |
| 2268 // TODO(jam): change to take RenderFrame. | |
| 2269 return new WebPluginImpl(frame, params, info.path, render_view_, this); | |
| 2270 } | |
| 2271 #endif | 2264 #endif |
| 2272 #endif | 2265 #endif |
| 2273 return NULL; | 2266 return NULL; |
| 2274 } | 2267 } |
| 2275 | 2268 |
| 2276 void RenderFrameImpl::LoadURLExternally(const blink::WebURLRequest& request, | 2269 void RenderFrameImpl::LoadURLExternally(const blink::WebURLRequest& request, |
| 2277 blink::WebNavigationPolicy policy) { | 2270 blink::WebNavigationPolicy policy) { |
| 2278 loadURLExternally(request, policy, WebString(), false); | 2271 loadURLExternally(request, policy, WebString(), false); |
| 2279 } | 2272 } |
| 2280 | 2273 |
| (...skipping 3756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6037 int match_count, | 6030 int match_count, |
| 6038 int ordinal, | 6031 int ordinal, |
| 6039 const WebRect& selection_rect, | 6032 const WebRect& selection_rect, |
| 6040 bool final_status_update) { | 6033 bool final_status_update) { |
| 6041 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6034 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6042 selection_rect, ordinal, | 6035 selection_rect, ordinal, |
| 6043 final_status_update)); | 6036 final_status_update)); |
| 6044 } | 6037 } |
| 6045 | 6038 |
| 6046 } // namespace content | 6039 } // namespace content |
| OLD | NEW |