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

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

Issue 2801853002: Media Remoting: Remove old interstitial implementation. (Closed)
Patch Set: Rebase. 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 | « chrome/common/media/media_resource_provider.cc ('k') | media/base/localized_strings.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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 #if !defined(ENABLE_MOJO_RENDERER) || \ 272 #if !defined(ENABLE_MOJO_RENDERER) || \
273 BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) 273 BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
274 #include "media/renderers/default_renderer_factory.h" // nogncheck 274 #include "media/renderers/default_renderer_factory.h" // nogncheck
275 #endif 275 #endif
276 276
277 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) 277 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
278 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck 278 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck
279 #endif 279 #endif
280 280
281 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 281 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
282 #include "content/renderer/image_downloader/single_image_downloader.h" // nognc heck
283 #include "media/remoting/adaptive_renderer_factory.h" // nogncheck 282 #include "media/remoting/adaptive_renderer_factory.h" // nogncheck
284 #include "media/remoting/remoting_cdm_controller.h" // nogncheck 283 #include "media/remoting/remoting_cdm_controller.h" // nogncheck
285 #include "media/remoting/remoting_cdm_factory.h" // nogncheck 284 #include "media/remoting/remoting_cdm_factory.h" // nogncheck
286 #include "media/remoting/renderer_controller.h" // nogncheck 285 #include "media/remoting/renderer_controller.h" // nogncheck
287 #include "media/remoting/shared_session.h" // nogncheck 286 #include "media/remoting/shared_session.h" // nogncheck
288 #include "media/remoting/sink_availability_observer.h" // nogncheck 287 #include "media/remoting/sink_availability_observer.h" // nogncheck
289 #endif 288 #endif
290 289
291 using base::Time; 290 using base::Time;
292 using base::TimeDelta; 291 using base::TimeDelta;
(...skipping 2644 matching lines...) Expand 10 before | Expand all | Expand 10 after
2937 } 2936 }
2938 #else 2937 #else
2939 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>( 2938 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
2940 GetMediaLog(), GetDecoderFactory(), 2939 GetMediaLog(), GetDecoderFactory(),
2941 base::Bind(&RenderThreadImpl::GetGpuFactories, 2940 base::Bind(&RenderThreadImpl::GetGpuFactories,
2942 base::Unretained(render_thread))); 2941 base::Unretained(render_thread)));
2943 #endif // defined(ENABLE_MOJO_RENDERER) 2942 #endif // defined(ENABLE_MOJO_RENDERER)
2944 } 2943 }
2945 2944
2946 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2945 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2947 auto* const remoting_controller_ptr = remoting_controller.get();
2948 media_renderer_factory = 2946 media_renderer_factory =
2949 base::MakeUnique<media::remoting::AdaptiveRendererFactory>( 2947 base::MakeUnique<media::remoting::AdaptiveRendererFactory>(
2950 std::move(media_renderer_factory), std::move(remoting_controller)); 2948 std::move(media_renderer_factory), std::move(remoting_controller));
2951 #endif 2949 #endif
2952 2950
2953 if (!url_index_.get() || url_index_->frame() != frame_) 2951 if (!url_index_.get() || url_index_->frame() != frame_)
2954 url_index_.reset(new media::UrlIndex(frame_)); 2952 url_index_.reset(new media::UrlIndex(frame_));
2955 2953
2956 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( 2954 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
2957 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(), 2955 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
2958 std::move(media_renderer_factory), url_index_, params); 2956 std::move(media_renderer_factory), url_index_, params);
2959 2957
2960 #if defined(OS_ANDROID) // WMPI_CAST 2958 #if defined(OS_ANDROID) // WMPI_CAST
2961 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2959 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2962 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2960 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2963 media_player->SetUseFallbackPath(use_fallback_path); 2961 media_player->SetUseFallbackPath(use_fallback_path);
2964 #endif // defined(OS_ANDROID) 2962 #endif // defined(OS_ANDROID)
2965 2963
2966 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2967 remoting_controller_ptr->SetDownloadPosterCallback(base::Bind(
2968 &SingleImageDownloader::DownloadImage, weak_factory_.GetWeakPtr()));
2969 #endif
2970 return media_player; 2964 return media_player;
2971 } 2965 }
2972 2966
2973 blink::WebApplicationCacheHost* RenderFrameImpl::CreateApplicationCacheHost( 2967 blink::WebApplicationCacheHost* RenderFrameImpl::CreateApplicationCacheHost(
2974 blink::WebApplicationCacheHostClient* client) { 2968 blink::WebApplicationCacheHostClient* client) {
2975 if (!frame_ || !frame_->View()) 2969 if (!frame_ || !frame_->View())
2976 return NULL; 2970 return NULL;
2977 2971
2978 DocumentState* document_state = 2972 DocumentState* document_state =
2979 frame_->ProvisionalDataSource() 2973 frame_->ProvisionalDataSource()
(...skipping 4007 matching lines...) Expand 10 before | Expand all | Expand 10 after
6987 policy(info.default_policy), 6981 policy(info.default_policy),
6988 replaces_current_history_item(info.replaces_current_history_item), 6982 replaces_current_history_item(info.replaces_current_history_item),
6989 history_navigation_in_new_child_frame( 6983 history_navigation_in_new_child_frame(
6990 info.is_history_navigation_in_new_child_frame), 6984 info.is_history_navigation_in_new_child_frame),
6991 client_redirect(info.is_client_redirect), 6985 client_redirect(info.is_client_redirect),
6992 cache_disabled(info.is_cache_disabled), 6986 cache_disabled(info.is_cache_disabled),
6993 form(info.form), 6987 form(info.form),
6994 source_location(info.source_location) {} 6988 source_location(info.source_location) {}
6995 6989
6996 } // namespace content 6990 } // namespace content
OLDNEW
« no previous file with comments | « chrome/common/media/media_resource_provider.cc ('k') | media/base/localized_strings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698