| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 #if defined(ENABLE_MOJO_RENDERER) | 232 #if defined(ENABLE_MOJO_RENDERER) |
| 233 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck | 233 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck |
| 234 #else | 234 #else |
| 235 #include "media/renderers/default_renderer_factory.h" | 235 #include "media/renderers/default_renderer_factory.h" |
| 236 #endif | 236 #endif |
| 237 | 237 |
| 238 #if defined(ENABLE_MOJO_AUDIO_DECODER) | 238 #if defined(ENABLE_MOJO_AUDIO_DECODER) |
| 239 #include "media/mojo/services/mojo_decoder_factory.h" // nogncheck | 239 #include "media/mojo/services/mojo_decoder_factory.h" // nogncheck |
| 240 #endif | 240 #endif |
| 241 | 241 |
| 242 #if defined(ENABLE_WEBVR) | |
| 243 #include "content/renderer/vr/vr_dispatcher.h" | |
| 244 #endif | |
| 245 | |
| 246 using blink::WebContentDecryptionModule; | 242 using blink::WebContentDecryptionModule; |
| 247 using blink::WebContextMenuData; | 243 using blink::WebContextMenuData; |
| 248 using blink::WebCString; | 244 using blink::WebCString; |
| 249 using blink::WebData; | 245 using blink::WebData; |
| 250 using blink::WebDataSource; | 246 using blink::WebDataSource; |
| 251 using blink::WebDocument; | 247 using blink::WebDocument; |
| 252 using blink::WebDOMEvent; | 248 using blink::WebDOMEvent; |
| 253 using blink::WebDOMMessageEvent; | 249 using blink::WebDOMMessageEvent; |
| 254 using blink::WebElement; | 250 using blink::WebElement; |
| 255 using blink::WebExternalPopupMenu; | 251 using blink::WebExternalPopupMenu; |
| (...skipping 4086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4342 return bluetooth_.get(); | 4338 return bluetooth_.get(); |
| 4343 } | 4339 } |
| 4344 | 4340 |
| 4345 blink::WebUSBClient* RenderFrameImpl::usbClient() { | 4341 blink::WebUSBClient* RenderFrameImpl::usbClient() { |
| 4346 if (!usb_client_) | 4342 if (!usb_client_) |
| 4347 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); | 4343 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); |
| 4348 | 4344 |
| 4349 return usb_client_.get(); | 4345 return usb_client_.get(); |
| 4350 } | 4346 } |
| 4351 | 4347 |
| 4352 #if defined(ENABLE_WEBVR) | |
| 4353 blink::WebVRClient* RenderFrameImpl::webVRClient() { | |
| 4354 if (!vr_dispatcher_) | |
| 4355 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry())); | |
| 4356 | |
| 4357 return vr_dispatcher_.get(); | |
| 4358 } | |
| 4359 #endif | |
| 4360 | |
| 4361 void RenderFrameImpl::didSerializeDataForFrame( | 4348 void RenderFrameImpl::didSerializeDataForFrame( |
| 4362 const WebCString& data, | 4349 const WebCString& data, |
| 4363 WebFrameSerializerClient::FrameSerializationStatus status) { | 4350 WebFrameSerializerClient::FrameSerializationStatus status) { |
| 4364 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; | 4351 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; |
| 4365 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( | 4352 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( |
| 4366 routing_id_, data, end_of_data)); | 4353 routing_id_, data, end_of_data)); |
| 4367 } | 4354 } |
| 4368 | 4355 |
| 4369 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 4356 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
| 4370 observers_.AddObserver(observer); | 4357 observers_.AddObserver(observer); |
| (...skipping 1761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6132 int match_count, | 6119 int match_count, |
| 6133 int ordinal, | 6120 int ordinal, |
| 6134 const WebRect& selection_rect, | 6121 const WebRect& selection_rect, |
| 6135 bool final_status_update) { | 6122 bool final_status_update) { |
| 6136 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6123 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6137 selection_rect, ordinal, | 6124 selection_rect, ordinal, |
| 6138 final_status_update)); | 6125 final_status_update)); |
| 6139 } | 6126 } |
| 6140 | 6127 |
| 6141 } // namespace content | 6128 } // namespace content |
| OLD | NEW |