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

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

Issue 2801853002: Media Remoting: Remove old interstitial implementation. (Closed)
Patch Set: Created 3 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 | « no previous file | media/remoting/BUILD.gn » ('j') | media/remoting/BUILD.gn » ('J')
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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 #if !defined(ENABLE_MOJO_RENDERER) || \ 270 #if !defined(ENABLE_MOJO_RENDERER) || \
271 BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) 271 BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
272 #include "media/renderers/default_renderer_factory.h" // nogncheck 272 #include "media/renderers/default_renderer_factory.h" // nogncheck
273 #endif 273 #endif
274 274
275 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) 275 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
276 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck 276 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck
277 #endif 277 #endif
278 278
279 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 279 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
280 #include "content/renderer/image_downloader/single_image_downloader.h" // nognc heck
281 #include "media/remoting/adaptive_renderer_factory.h" // nogncheck 280 #include "media/remoting/adaptive_renderer_factory.h" // nogncheck
282 #include "media/remoting/remoting_cdm_controller.h" // nogncheck 281 #include "media/remoting/remoting_cdm_controller.h" // nogncheck
283 #include "media/remoting/remoting_cdm_factory.h" // nogncheck 282 #include "media/remoting/remoting_cdm_factory.h" // nogncheck
284 #include "media/remoting/renderer_controller.h" // nogncheck 283 #include "media/remoting/renderer_controller.h" // nogncheck
285 #include "media/remoting/shared_session.h" // nogncheck 284 #include "media/remoting/shared_session.h" // nogncheck
286 #include "media/remoting/sink_availability_observer.h" // nogncheck 285 #include "media/remoting/sink_availability_observer.h" // nogncheck
287 #endif 286 #endif
288 287
289 using base::Time; 288 using base::Time;
290 using base::TimeDelta; 289 using base::TimeDelta;
(...skipping 2626 matching lines...) Expand 10 before | Expand all | Expand 10 after
2917 } 2916 }
2918 #else 2917 #else
2919 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>( 2918 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
2920 media_log, GetDecoderFactory(), 2919 media_log, GetDecoderFactory(),
2921 base::Bind(&RenderThreadImpl::GetGpuFactories, 2920 base::Bind(&RenderThreadImpl::GetGpuFactories,
2922 base::Unretained(render_thread))); 2921 base::Unretained(render_thread)));
2923 #endif // defined(ENABLE_MOJO_RENDERER) 2922 #endif // defined(ENABLE_MOJO_RENDERER)
2924 } 2923 }
2925 2924
2926 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2925 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2927 auto* const remoting_controller_ptr = remoting_controller.get();
2928 media_renderer_factory = 2926 media_renderer_factory =
2929 base::MakeUnique<media::remoting::AdaptiveRendererFactory>( 2927 base::MakeUnique<media::remoting::AdaptiveRendererFactory>(
2930 std::move(media_renderer_factory), std::move(remoting_controller)); 2928 std::move(media_renderer_factory), std::move(remoting_controller));
2931 #endif 2929 #endif
2932 2930
2933 if (!url_index_.get() || url_index_->frame() != frame_) 2931 if (!url_index_.get() || url_index_->frame() != frame_)
2934 url_index_.reset(new media::UrlIndex(frame_)); 2932 url_index_.reset(new media::UrlIndex(frame_));
2935 2933
2936 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( 2934 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
2937 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(), 2935 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
2938 std::move(media_renderer_factory), url_index_, params); 2936 std::move(media_renderer_factory), url_index_, params);
2939 2937
2940 #if defined(OS_ANDROID) // WMPI_CAST 2938 #if defined(OS_ANDROID) // WMPI_CAST
2941 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2939 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2942 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2940 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2943 media_player->SetUseFallbackPath(use_fallback_path); 2941 media_player->SetUseFallbackPath(use_fallback_path);
2944 #endif // defined(OS_ANDROID) 2942 #endif // defined(OS_ANDROID)
2945 2943
2946 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2947 remoting_controller_ptr->SetDownloadPosterCallback(base::Bind(
2948 &SingleImageDownloader::DownloadImage, weak_factory_.GetWeakPtr()));
2949 #endif
2950 return media_player; 2944 return media_player;
2951 } 2945 }
2952 2946
2953 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2947 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2954 blink::WebApplicationCacheHostClient* client) { 2948 blink::WebApplicationCacheHostClient* client) {
2955 if (!frame_ || !frame_->view()) 2949 if (!frame_ || !frame_->view())
2956 return NULL; 2950 return NULL;
2957 2951
2958 DocumentState* document_state = 2952 DocumentState* document_state =
2959 frame_->provisionalDataSource() 2953 frame_->provisionalDataSource()
(...skipping 4012 matching lines...) Expand 10 before | Expand all | Expand 10 after
6972 policy(info.defaultPolicy), 6966 policy(info.defaultPolicy),
6973 replaces_current_history_item(info.replacesCurrentHistoryItem), 6967 replaces_current_history_item(info.replacesCurrentHistoryItem),
6974 history_navigation_in_new_child_frame( 6968 history_navigation_in_new_child_frame(
6975 info.isHistoryNavigationInNewChildFrame), 6969 info.isHistoryNavigationInNewChildFrame),
6976 client_redirect(info.isClientRedirect), 6970 client_redirect(info.isClientRedirect),
6977 cache_disabled(info.isCacheDisabled), 6971 cache_disabled(info.isCacheDisabled),
6978 form(info.form), 6972 form(info.form),
6979 source_location(info.sourceLocation) {} 6973 source_location(info.sourceLocation) {}
6980 6974
6981 } // namespace content 6975 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/remoting/BUILD.gn » ('j') | media/remoting/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698