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

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

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated to use Mojo as requested by eng review Created 5 years, 6 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 179 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
180 #endif 180 #endif
181 181
182 #if defined(ENABLE_MEDIA_MOJO_RENDERER) 182 #if defined(ENABLE_MEDIA_MOJO_RENDERER)
183 #include "content/renderer/media/media_renderer_service_provider.h" 183 #include "content/renderer/media/media_renderer_service_provider.h"
184 #include "media/mojo/services/mojo_renderer_factory.h" 184 #include "media/mojo/services/mojo_renderer_factory.h"
185 #else 185 #else
186 #include "media/renderers/default_renderer_factory.h" 186 #include "media/renderers/default_renderer_factory.h"
187 #endif 187 #endif
188 188
189 #if defined(ENABLE_WEBVR)
190 #include "content/renderer/vr/vr_dispatcher.h"
191 #endif
192
189 using blink::WebContextMenuData; 193 using blink::WebContextMenuData;
190 using blink::WebData; 194 using blink::WebData;
191 using blink::WebDataSource; 195 using blink::WebDataSource;
192 using blink::WebDocument; 196 using blink::WebDocument;
193 using blink::WebDOMEvent; 197 using blink::WebDOMEvent;
194 using blink::WebDOMMessageEvent; 198 using blink::WebDOMMessageEvent;
195 using blink::WebElement; 199 using blink::WebElement;
196 using blink::WebExternalPopupMenu; 200 using blink::WebExternalPopupMenu;
197 using blink::WebExternalPopupMenuClient; 201 using blink::WebExternalPopupMenuClient;
198 using blink::WebFrame; 202 using blink::WebFrame;
(...skipping 3548 matching lines...) Expand 10 before | Expand all | Expand 10 after
3747 3751
3748 blink::WebAppBannerClient* RenderFrameImpl::appBannerClient() { 3752 blink::WebAppBannerClient* RenderFrameImpl::appBannerClient() {
3749 if (!app_banner_client_) { 3753 if (!app_banner_client_) {
3750 app_banner_client_ = 3754 app_banner_client_ =
3751 GetContentClient()->renderer()->CreateAppBannerClient(this); 3755 GetContentClient()->renderer()->CreateAppBannerClient(this);
3752 } 3756 }
3753 3757
3754 return app_banner_client_.get(); 3758 return app_banner_client_.get();
3755 } 3759 }
3756 3760
3761 #if defined(ENABLE_WEBVR)
3762 blink::WebVRClient* RenderFrameImpl::webVRClient() {
3763 if (!vr_dispatcher_)
3764 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry()));
3765
3766 return vr_dispatcher_.get();
3767 }
3768 #endif
3769
3757 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { 3770 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) {
3758 Send(new FrameHostMsg_MediaPlayingNotification( 3771 Send(new FrameHostMsg_MediaPlayingNotification(
3759 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), 3772 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(),
3760 player->hasAudio(), player->isRemote())); 3773 player->hasAudio(), player->isRemote()));
3761 } 3774 }
3762 3775
3763 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { 3776 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) {
3764 Send(new FrameHostMsg_MediaPausedNotification( 3777 Send(new FrameHostMsg_MediaPausedNotification(
3765 routing_id_, reinterpret_cast<int64>(player))); 3778 routing_id_, reinterpret_cast<int64>(player)));
3766 } 3779 }
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
4917 #elif defined(ENABLE_BROWSER_CDMS) 4930 #elif defined(ENABLE_BROWSER_CDMS)
4918 cdm_manager_, 4931 cdm_manager_,
4919 #endif 4932 #endif
4920 this); 4933 this);
4921 } 4934 }
4922 4935
4923 return cdm_factory_; 4936 return cdm_factory_;
4924 } 4937 }
4925 4938
4926 } // namespace content 4939 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698