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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

Issue 1436703002: Revert of [Presentation API / Media Router] Clean up default pres URL logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/ui/webui/media_router/media_router_dialog_controller_impl.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc
index d81c695f44044baf2dfa08f0844780bc02f7af8b..ffcecc2c73d7c76313e6acb8c4e8b72a92009bbe 100644
--- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc
@@ -274,18 +274,18 @@
return;
}
- scoped_ptr<CreatePresentationConnectionRequest> create_connection_request(
- TakeCreateConnectionRequest());
+ scoped_ptr<CreatePresentationSessionRequest> presentation_request(
+ TakePresentationRequest());
// TODO(imcheng): Don't create PresentationServiceDelegateImpl if it doesn't
// exist (crbug.com/508695).
base::WeakPtr<PresentationServiceDelegateImpl> delegate =
PresentationServiceDelegateImpl::GetOrCreateForWebContents(initiator())
->GetWeakPtr();
- if (!create_connection_request.get()) {
+ if (!presentation_request.get()) {
media_router_ui->InitWithDefaultMediaSource(delegate);
} else {
media_router_ui->InitWithPresentationSessionRequest(
- initiator(), delegate, create_connection_request.Pass());
+ initiator(), delegate, presentation_request.Pass());
}
}
« no previous file with comments | « chrome/browser/media/router/render_frame_host_id.h ('k') | chrome/browser/ui/webui/media_router/media_router_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698