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

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

Issue 2538853002: Media Remoting: Draw remoting interstitial on poster image. (Closed)
Patch Set: Addressed nasko's comments. Created 3 years, 11 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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 #include "media/mojo/clients/mojo_renderer_factory.h" // nogncheck 257 #include "media/mojo/clients/mojo_renderer_factory.h" // nogncheck
258 #else 258 #else
259 #include "media/renderers/default_renderer_factory.h" 259 #include "media/renderers/default_renderer_factory.h"
260 #endif 260 #endif
261 261
262 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) 262 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
263 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck 263 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck
264 #endif 264 #endif
265 265
266 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 266 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
267 #include "content/renderer/image_downloader/single_image_downloader.h" // nognc heck
267 #include "media/remoting/remoting_cdm_controller.h" // nogncheck 268 #include "media/remoting/remoting_cdm_controller.h" // nogncheck
268 #include "media/remoting/remoting_cdm_factory.h" // nogncheck 269 #include "media/remoting/remoting_cdm_factory.h" // nogncheck
269 #include "media/remoting/remoting_renderer_controller.h" // nogncheck 270 #include "media/remoting/remoting_renderer_controller.h" // nogncheck
270 #include "media/remoting/remoting_renderer_factory.h" // nogncheck 271 #include "media/remoting/remoting_renderer_factory.h" // nogncheck
271 #include "media/remoting/remoting_sink_observer.h" // nogncheck 272 #include "media/remoting/remoting_sink_observer.h" // nogncheck
272 #endif 273 #endif
273 274
274 using base::Time; 275 using base::Time;
275 using base::TimeDelta; 276 using base::TimeDelta;
276 using blink::WebCachePolicy; 277 using blink::WebCachePolicy;
(...skipping 2630 matching lines...) Expand 10 before | Expand all | Expand 10 after
2907 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2908 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2908 media_player->SetUseFallbackPath(use_fallback_path); 2909 media_player->SetUseFallbackPath(use_fallback_path);
2909 #endif // defined(OS_ANDROID) 2910 #endif // defined(OS_ANDROID)
2910 2911
2911 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2912 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2912 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( 2913 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind(
2913 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); 2914 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr()));
2914 remoting_controller_ptr->SetRemoteSinkAvailableChangedCallback(base::Bind( 2915 remoting_controller_ptr->SetRemoteSinkAvailableChangedCallback(base::Bind(
2915 &media::WebMediaPlayerImpl::ActivateViewportIntersectionMonitoring, 2916 &media::WebMediaPlayerImpl::ActivateViewportIntersectionMonitoring,
2916 media_player->AsWeakPtr())); 2917 media_player->AsWeakPtr()));
2918 remoting_controller_ptr->SetDownloadPosterCallback(base::Bind(
2919 &SingleImageDownloader::DownloadImage, weak_factory_.GetWeakPtr()));
2917 #endif 2920 #endif
2918 return media_player; 2921 return media_player;
2919 } 2922 }
2920 2923
2921 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2924 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2922 blink::WebApplicationCacheHostClient* client) { 2925 blink::WebApplicationCacheHostClient* client) {
2923 if (!frame_ || !frame_->view()) 2926 if (!frame_ || !frame_->view())
2924 return NULL; 2927 return NULL;
2925 2928
2926 DocumentState* document_state = 2929 DocumentState* document_state =
(...skipping 3838 matching lines...) Expand 10 before | Expand all | Expand 10 after
6765 // event target. Potentially a Pepper plugin will receive the event. 6768 // event target. Potentially a Pepper plugin will receive the event.
6766 // In order to tell whether a plugin gets the last mouse event and which it 6769 // In order to tell whether a plugin gets the last mouse event and which it
6767 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6770 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6768 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6771 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6769 // |pepper_last_mouse_event_target_|. 6772 // |pepper_last_mouse_event_target_|.
6770 pepper_last_mouse_event_target_ = nullptr; 6773 pepper_last_mouse_event_target_ = nullptr;
6771 #endif 6774 #endif
6772 } 6775 }
6773 6776
6774 } // namespace content 6777 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/image_downloader/single_image_downloader.cc ('k') | media/base/media_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698