content/renderer/presentation/presentation_dispatcher.cc - Issue 1507743005: [MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/presentation/presentation_dispatcher.cc

Issue 1507743005: [MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Forgot a call to DetachRoute! Created 5 years 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

« chrome/browser/media/router/presentation_service_delegate_impl.cc ('K') | « content/public/browser/presentation_service_delegate.h ('k') | extensions/renderer/resources/media_router_bindings.js » ('j') | extensions/renderer/resources/media_router_bindings.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/presentation/presentation_dispatcher.cc

diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc

index 6e0f3f2d971e6585ac3cfbab21c94e6aab02b8be..d299c1abf019c3c9ce629ae781986b1f5dd04bed 100644

--- a/content/renderer/presentation/presentation_dispatcher.cc

+++ b/content/renderer/presentation/presentation_dispatcher.cc

@@ -210,9 +210,8 @@ void PresentationDispatcher::closeSession(

const blink::WebString& presentationId) {

ConnectToPresentationServiceIfNeeded();

- presentation_service_->CloseSession(

- presentationUrl.utf8(),

- presentationId.utf8());

+ presentation_service_->CloseConnection(presentationUrl.utf8(),

+ presentationId.utf8());

}

void PresentationDispatcher::terminateSession(

@@ -220,9 +219,8 @@ void PresentationDispatcher::terminateSession(

const blink::WebString& presentationId) {

ConnectToPresentationServiceIfNeeded();

- presentation_service_->TerminateSession(

- presentationUrl.utf8(),

- presentationId.utf8());

+ presentation_service_->Terminate(presentationUrl.utf8(),

+ presentationId.utf8());

}

void PresentationDispatcher::getAvailability(