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

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: Rebase to ToT! Created 4 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/vr/vr_dispatcher.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 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::WebCachePolicy; 242 using blink::WebCachePolicy;
247 using blink::WebContentDecryptionModule; 243 using blink::WebContentDecryptionModule;
248 using blink::WebContextMenuData; 244 using blink::WebContextMenuData;
249 using blink::WebCString; 245 using blink::WebCString;
250 using blink::WebData; 246 using blink::WebData;
251 using blink::WebDataSource; 247 using blink::WebDataSource;
252 using blink::WebDocument; 248 using blink::WebDocument;
253 using blink::WebDOMEvent; 249 using blink::WebDOMEvent;
254 using blink::WebDOMMessageEvent; 250 using blink::WebDOMMessageEvent;
255 using blink::WebElement; 251 using blink::WebElement;
(...skipping 4026 matching lines...) Expand 10 before | Expand all | Expand 10 after
4282 // ChildThreadImpl::current() is null in some tests. 4278 // ChildThreadImpl::current() is null in some tests.
4283 if (!bluetooth_ && ChildThreadImpl::current()) { 4279 if (!bluetooth_ && ChildThreadImpl::current()) {
4284 bluetooth_.reset(new WebBluetoothImpl( 4280 bluetooth_.reset(new WebBluetoothImpl(
4285 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(), 4281 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(),
4286 routing_id_)); 4282 routing_id_));
4287 } 4283 }
4288 4284
4289 return bluetooth_.get(); 4285 return bluetooth_.get();
4290 } 4286 }
4291 4287
4292 #if defined(ENABLE_WEBVR)
4293 blink::WebVRClient* RenderFrameImpl::webVRClient() {
4294 if (!vr_dispatcher_)
4295 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry()));
4296
4297 return vr_dispatcher_.get();
4298 }
4299 #endif
4300
4301 void RenderFrameImpl::didSerializeDataForFrame( 4288 void RenderFrameImpl::didSerializeDataForFrame(
4302 const WebCString& data, 4289 const WebCString& data,
4303 WebFrameSerializerClient::FrameSerializationStatus status) { 4290 WebFrameSerializerClient::FrameSerializationStatus status) {
4304 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; 4291 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished;
4305 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( 4292 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse(
4306 routing_id_, data, end_of_data)); 4293 routing_id_, data, end_of_data));
4307 } 4294 }
4308 4295
4309 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { 4296 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
4310 observers_.AddObserver(observer); 4297 observers_.AddObserver(observer);
(...skipping 1722 matching lines...) Expand 10 before | Expand all | Expand 10 after
6033 int match_count, 6020 int match_count,
6034 int ordinal, 6021 int ordinal,
6035 const WebRect& selection_rect, 6022 const WebRect& selection_rect,
6036 bool final_status_update) { 6023 bool final_status_update) {
6037 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6024 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6038 selection_rect, ordinal, 6025 selection_rect, ordinal,
6039 final_status_update)); 6026 final_status_update));
6040 } 6027 }
6041 6028
6042 } // namespace content 6029 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/vr/vr_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698