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

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

Issue 1808203005: [OnionSoup] Moving VR service from content to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reworked as per comments! Created 4 years, 9 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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
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) || defined(ENABLE_MOJO_VIDEO_DECODER) 238 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_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 4007 matching lines...) Expand 10 before | Expand all | Expand 10 after
4263 return bluetooth_.get(); 4259 return bluetooth_.get();
4264 } 4260 }
4265 4261
4266 blink::WebUSBClient* RenderFrameImpl::usbClient() { 4262 blink::WebUSBClient* RenderFrameImpl::usbClient() {
4267 if (!usb_client_) 4263 if (!usb_client_)
4268 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); 4264 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry()));
4269 4265
4270 return usb_client_.get(); 4266 return usb_client_.get();
4271 } 4267 }
4272 4268
4273 #if defined(ENABLE_WEBVR)
4274 blink::WebVRClient* RenderFrameImpl::webVRClient() {
4275 if (!vr_dispatcher_)
4276 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry()));
4277
4278 return vr_dispatcher_.get();
4279 }
4280 #endif
4281
4282 void RenderFrameImpl::didSerializeDataForFrame( 4269 void RenderFrameImpl::didSerializeDataForFrame(
4283 const WebCString& data, 4270 const WebCString& data,
4284 WebFrameSerializerClient::FrameSerializationStatus status) { 4271 WebFrameSerializerClient::FrameSerializationStatus status) {
4285 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; 4272 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished;
4286 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( 4273 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse(
4287 routing_id_, data, end_of_data)); 4274 routing_id_, data, end_of_data));
4288 } 4275 }
4289 4276
4290 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { 4277 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
4291 observers_.AddObserver(observer); 4278 observers_.AddObserver(observer);
(...skipping 1709 matching lines...) Expand 10 before | Expand all | Expand 10 after
6001 int match_count, 5988 int match_count,
6002 int ordinal, 5989 int ordinal,
6003 const WebRect& selection_rect, 5990 const WebRect& selection_rect,
6004 bool final_status_update) { 5991 bool final_status_update) {
6005 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 5992 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6006 selection_rect, ordinal, 5993 selection_rect, ordinal,
6007 final_status_update)); 5994 final_status_update));
6008 } 5995 }
6009 5996
6010 } // namespace content 5997 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698