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

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

Issue 2538853002: Media Remoting: Draw remoting interstitial on poster image. (Closed)
Patch Set: Addressed comments. Created 4 years 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 #include "media/mojo/clients/mojo_renderer_factory.h" // nogncheck 253 #include "media/mojo/clients/mojo_renderer_factory.h" // nogncheck
254 #else 254 #else
255 #include "media/renderers/default_renderer_factory.h" 255 #include "media/renderers/default_renderer_factory.h"
256 #endif 256 #endif
257 257
258 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) 258 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
259 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck 259 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck
260 #endif 260 #endif
261 261
262 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 262 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
263 #include "content/renderer/image_downloader/single_image_downloader.h" // nognc heck
263 #include "media/remoting/remoting_cdm_controller.h" // nogncheck 264 #include "media/remoting/remoting_cdm_controller.h" // nogncheck
264 #include "media/remoting/remoting_cdm_factory.h" // nogncheck 265 #include "media/remoting/remoting_cdm_factory.h" // nogncheck
265 #include "media/remoting/remoting_renderer_controller.h" // nogncheck 266 #include "media/remoting/remoting_renderer_controller.h" // nogncheck
266 #include "media/remoting/remoting_renderer_factory.h" // nogncheck 267 #include "media/remoting/remoting_renderer_factory.h" // nogncheck
267 #include "media/remoting/remoting_sink_observer.h" // nogncheck 268 #include "media/remoting/remoting_sink_observer.h" // nogncheck
268 #endif 269 #endif
269 270
270 using base::Time; 271 using base::Time;
271 using base::TimeDelta; 272 using base::TimeDelta;
272 using blink::WebCachePolicy; 273 using blink::WebCachePolicy;
(...skipping 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after
2898 2899
2899 #if defined(OS_ANDROID) // WMPI_CAST 2900 #if defined(OS_ANDROID) // WMPI_CAST
2900 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2901 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2901 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2902 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2902 media_player->SetUseFallbackPath(use_fallback_path); 2903 media_player->SetUseFallbackPath(use_fallback_path);
2903 #endif // defined(OS_ANDROID) 2904 #endif // defined(OS_ANDROID)
2904 2905
2905 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2906 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2906 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( 2907 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind(
2907 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); 2908 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr()));
2909 remoting_controller_ptr->SetDownloadPosterCallback(base::Bind(
2910 &SingleImageDownloader::DownloadImage, weak_factory_.GetWeakPtr()));
2908 #endif 2911 #endif
2909 return media_player; 2912 return media_player;
2910 } 2913 }
2911 2914
2912 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2915 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2913 blink::WebApplicationCacheHostClient* client) { 2916 blink::WebApplicationCacheHostClient* client) {
2914 if (!frame_ || !frame_->view()) 2917 if (!frame_ || !frame_->view())
2915 return NULL; 2918 return NULL;
2916 return new RendererWebApplicationCacheHostImpl( 2919 return new RendererWebApplicationCacheHostImpl(
2917 RenderViewImpl::FromWebView(frame_->view()), client, 2920 RenderViewImpl::FromWebView(frame_->view()), client,
(...skipping 3742 matching lines...) Expand 10 before | Expand all | Expand 10 after
6660 // event target. Potentially a Pepper plugin will receive the event. 6663 // event target. Potentially a Pepper plugin will receive the event.
6661 // In order to tell whether a plugin gets the last mouse event and which it 6664 // In order to tell whether a plugin gets the last mouse event and which it
6662 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6665 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6663 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6666 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6664 // |pepper_last_mouse_event_target_|. 6667 // |pepper_last_mouse_event_target_|.
6665 pepper_last_mouse_event_target_ = nullptr; 6668 pepper_last_mouse_event_target_ = nullptr;
6666 #endif 6669 #endif
6667 } 6670 }
6668 6671
6669 } // namespace content 6672 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698