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

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: remove s 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..8da6ddb93b1935988c8b6e6de2250ed6fd11f5b3 100644
--- a/chrome/browser/media/router/media_router_dialog_controller.cc
+++ b/chrome/browser/media/router/media_router_dialog_controller.cc
@@ -80,7 +80,7 @@ bool MediaRouterDialogController::ShowMediaRouterDialogForPresentation(
if (IsShowingMediaRouterDialog())
return false;
- presentation_request_ = request.Pass();
+ create_session_request_ = request.Pass();
CreateMediaRouterDialog();
// Show the initiator holding the existing media router dialog.
@@ -116,12 +116,12 @@ void MediaRouterDialogController::ActivateInitiatorWebContents() {
scoped_ptr<CreatePresentationSessionRequest>
MediaRouterDialogController::TakePresentationRequest() {
- return presentation_request_.Pass();
+ return create_session_request_.Pass();
}
void MediaRouterDialogController::Reset() {
initiator_observer_.reset();
- presentation_request_.reset();
+ create_session_request_.reset();
}
} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698