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

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

Issue 1406013003: [Presentation API / Media Router] Clean up default pres URL logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Original patch 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/media/router/media_router_dialog_controller.cc
diff --git a/chrome/browser/media/router/media_router_dialog_controller.cc b/chrome/browser/media/router/media_router_dialog_controller.cc
index f363730fe0a0a6ff014f7df935a34480c0c242cf..2f0583d7294019227c059ffe3a843ac1dd9fb7d3 100644
--- a/chrome/browser/media/router/media_router_dialog_controller.cc
+++ b/chrome/browser/media/router/media_router_dialog_controller.cc
@@ -73,14 +73,14 @@ MediaRouterDialogController::~MediaRouterDialogController() {
}
bool MediaRouterDialogController::ShowMediaRouterDialogForPresentation(
- scoped_ptr<CreatePresentationSessionRequest> request) {
+ scoped_ptr<CreatePresentationConnectionRequest> request) {
DCHECK(thread_checker_.CalledOnValidThread());
// Check if the media router dialog exists for |initiator| and return if so.
if (IsShowingMediaRouterDialog())
return false;
- presentation_request_ = request.Pass();
+ create_connection_request_ = request.Pass();
CreateMediaRouterDialog();
// Show the initiator holding the existing media router dialog.
@@ -114,14 +114,14 @@ void MediaRouterDialogController::ActivateInitiatorWebContents() {
initiator_->GetDelegate()->ActivateContents(initiator_);
}
-scoped_ptr<CreatePresentationSessionRequest>
-MediaRouterDialogController::TakePresentationRequest() {
- return presentation_request_.Pass();
+scoped_ptr<CreatePresentationConnectionRequest>
+MediaRouterDialogController::TakeCreateConnectionRequest() {
+ return create_connection_request_.Pass();
}
void MediaRouterDialogController::Reset() {
initiator_observer_.reset();
- presentation_request_.reset();
+ create_connection_request_.reset();
}
} // namespace media_router
« no previous file with comments | « chrome/browser/media/router/media_router_dialog_controller.h ('k') | chrome/browser/media/router/presentation_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698