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

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

Issue 1906883002: [Do Not Commit] Migrate vr service from content/renderer/ to WebKit/platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 #if defined(ENABLE_MOJO_RENDERER) 235 #if defined(ENABLE_MOJO_RENDERER)
236 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck 236 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck
237 #else 237 #else
238 #include "media/renderers/default_renderer_factory.h" 238 #include "media/renderers/default_renderer_factory.h"
239 #endif 239 #endif
240 240
241 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) 241 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
242 #include "media/mojo/services/mojo_decoder_factory.h" // nogncheck 242 #include "media/mojo/services/mojo_decoder_factory.h" // nogncheck
243 #endif 243 #endif
244 244
245 #if defined(ENABLE_WEBVR)
246 #include "content/renderer/vr/vr_dispatcher.h"
247 #endif
248
249 using blink::WebCachePolicy; 245 using blink::WebCachePolicy;
250 using blink::WebContentDecryptionModule; 246 using blink::WebContentDecryptionModule;
251 using blink::WebContextMenuData; 247 using blink::WebContextMenuData;
252 using blink::WebCString; 248 using blink::WebCString;
253 using blink::WebData; 249 using blink::WebData;
254 using blink::WebDataSource; 250 using blink::WebDataSource;
255 using blink::WebDocument; 251 using blink::WebDocument;
256 using blink::WebDOMEvent; 252 using blink::WebDOMEvent;
257 using blink::WebDOMMessageEvent; 253 using blink::WebDOMMessageEvent;
258 using blink::WebElement; 254 using blink::WebElement;
(...skipping 4029 matching lines...) Expand 10 before | Expand all | Expand 10 after
4288 blink::WebUSBClient* RenderFrameImpl::usbClient() { 4284 blink::WebUSBClient* RenderFrameImpl::usbClient() {
4289 if (!base::FeatureList::IsEnabled(features::kWebUsb)) 4285 if (!base::FeatureList::IsEnabled(features::kWebUsb))
4290 return nullptr; 4286 return nullptr;
4291 4287
4292 if (!usb_client_) 4288 if (!usb_client_)
4293 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); 4289 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry()));
4294 4290
4295 return usb_client_.get(); 4291 return usb_client_.get();
4296 } 4292 }
4297 4293
4298 #if defined(ENABLE_WEBVR)
4299 blink::WebVRClient* RenderFrameImpl::webVRClient() {
4300 if (!vr_dispatcher_)
4301 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry()));
4302
4303 return vr_dispatcher_.get();
4304 }
4305 #endif
4306
4307 void RenderFrameImpl::didSerializeDataForFrame( 4294 void RenderFrameImpl::didSerializeDataForFrame(
4308 const WebCString& data, 4295 const WebCString& data,
4309 WebFrameSerializerClient::FrameSerializationStatus status) { 4296 WebFrameSerializerClient::FrameSerializationStatus status) {
4310 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; 4297 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished;
4311 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( 4298 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse(
4312 routing_id_, data, end_of_data)); 4299 routing_id_, data, end_of_data));
4313 } 4300 }
4314 4301
4315 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { 4302 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
4316 observers_.AddObserver(observer); 4303 observers_.AddObserver(observer);
(...skipping 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after
6040 int match_count, 6027 int match_count,
6041 int ordinal, 6028 int ordinal,
6042 const WebRect& selection_rect, 6029 const WebRect& selection_rect,
6043 bool final_status_update) { 6030 bool final_status_update) {
6044 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6031 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6045 selection_rect, ordinal, 6032 selection_rect, ordinal,
6046 final_status_update)); 6033 final_status_update));
6047 } 6034 }
6048 6035
6049 } // namespace content 6036 } // 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