| 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
|
|
|