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

Unified Diff: chrome/browser/media/router/presentation_service_delegate_impl.cc

Issue 2972933002: [Media Router] Move main frame check for SetDefaultPresentationUrls. (Closed)
Patch Set: Rebase Created 3 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/router/presentation_service_delegate_impl.cc
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc
index 8827de8373f83802671f87e80e64fb6cd5aa9ca8..4f62975a8e0adb90e8c868db504da43569279fda 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -51,13 +51,6 @@ namespace {
using DelegateObserver = content::PresentationServiceDelegate::Observer;
-// Returns the unique identifier for the supplied RenderFrameHost.
-RenderFrameHostId GetRenderFrameHostId(RenderFrameHost* render_frame_host) {
- int render_process_id = render_frame_host->GetProcess()->GetID();
- int render_frame_id = render_frame_host->GetRoutingID();
- return RenderFrameHostId(render_process_id, render_frame_id);
-}
-
// Gets the last committed URL for the render frame specified by
// |render_frame_host_id|.
url::Origin GetLastCommittedURLForFrame(
@@ -383,9 +376,6 @@ void PresentationServiceDelegateImpl::SetDefaultPresentationUrls(
const std::vector<GURL>& default_presentation_urls,
content::DefaultPresentationConnectionCallback callback) {
RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
- if (!IsMainFrame(render_frame_host_id))
- return;
-
if (default_presentation_urls.empty()) {
ClearDefaultPresentationRequest();
return;
@@ -742,13 +732,6 @@ void PresentationServiceDelegateImpl::ClearDefaultPresentationRequest() {
observer.OnDefaultPresentationRemoved();
}
-// TODO(imcheng): Move this check to PresentationServiceImpl.
-bool PresentationServiceDelegateImpl::IsMainFrame(
- const RenderFrameHostId& render_frame_host_id) const {
- RenderFrameHost* main_frame = web_contents_->GetMainFrame();
- return main_frame && GetRenderFrameHostId(main_frame) == render_frame_host_id;
-}
-
MediaRoute::Id PresentationServiceDelegateImpl::GetRouteId(
const RenderFrameHostId& render_frame_host_id,
const std::string& presentation_id) const {

Powered by Google App Engine
This is Rietveld 408576698