| 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 | 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 Loading... |
| 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/content_media_service_provider.h" | 183 #include "content/renderer/media/content_media_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 3532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3731 | 3735 |
| 3732 blink::WebAppBannerClient* RenderFrameImpl::appBannerClient() { | 3736 blink::WebAppBannerClient* RenderFrameImpl::appBannerClient() { |
| 3733 if (!app_banner_client_) { | 3737 if (!app_banner_client_) { |
| 3734 app_banner_client_ = | 3738 app_banner_client_ = |
| 3735 GetContentClient()->renderer()->CreateAppBannerClient(this); | 3739 GetContentClient()->renderer()->CreateAppBannerClient(this); |
| 3736 } | 3740 } |
| 3737 | 3741 |
| 3738 return app_banner_client_.get(); | 3742 return app_banner_client_.get(); |
| 3739 } | 3743 } |
| 3740 | 3744 |
| 3745 #if defined(ENABLE_WEBVR) |
| 3746 blink::WebVRClient* RenderFrameImpl::webVRClient() { |
| 3747 if (!vr_dispatcher_) |
| 3748 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry())); |
| 3749 |
| 3750 return vr_dispatcher_.get(); |
| 3751 } |
| 3752 #endif |
| 3753 |
| 3741 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { | 3754 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { |
| 3742 Send(new FrameHostMsg_MediaPlayingNotification( | 3755 Send(new FrameHostMsg_MediaPlayingNotification( |
| 3743 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), | 3756 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), |
| 3744 player->hasAudio(), player->isRemote())); | 3757 player->hasAudio(), player->isRemote())); |
| 3745 } | 3758 } |
| 3746 | 3759 |
| 3747 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { | 3760 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { |
| 3748 Send(new FrameHostMsg_MediaPausedNotification( | 3761 Send(new FrameHostMsg_MediaPausedNotification( |
| 3749 routing_id_, reinterpret_cast<int64>(player))); | 3762 routing_id_, reinterpret_cast<int64>(player))); |
| 3750 } | 3763 } |
| (...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4909 #elif defined(ENABLE_BROWSER_CDMS) | 4922 #elif defined(ENABLE_BROWSER_CDMS) |
| 4910 cdm_manager_, | 4923 cdm_manager_, |
| 4911 #endif | 4924 #endif |
| 4912 this); | 4925 this); |
| 4913 } | 4926 } |
| 4914 | 4927 |
| 4915 return cdm_factory_; | 4928 return cdm_factory_; |
| 4916 } | 4929 } |
| 4917 | 4930 |
| 4918 } // namespace content | 4931 } // namespace content |
| OLD | NEW |