chrome/browser/media/android/router/media_router_android.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: chrome/browser/media/android/router/media_router_android.cc

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

Patch Set: Fix android build 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

« no previous file with comments | « chrome/browser/media/android/router/media_router_android.h ('k') | chrome/browser/media/android/router/media_router_dialog_controller_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/android/router/media_router_android.cc

diff --git a/chrome/browser/media/android/router/media_router_android.cc b/chrome/browser/media/android/router/media_router_android.cc

index 10e288989c5bb79977469146b195f6bb5ac00d54..a3e6e8af0bcd02e0a6e008dd8e2b5cc884b486cd 100644

--- a/chrome/browser/media/android/router/media_router_android.cc

+++ b/chrome/browser/media/android/router/media_router_android.cc

@@ -150,7 +150,7 @@ void MediaRouterAndroid::JoinRoute(

request_id);

}

-void MediaRouterAndroid::CloseRoute(const MediaRoute::Id& route_id) {

+void MediaRouterAndroid::TerminateRoute(const MediaRoute::Id& route_id) {

JNIEnv* env = base::android::AttachCurrentThread();

ScopedJavaLocalRef<jstring> jroute_id =

base::android::ConvertUTF8ToJavaString(env, route_id);

@@ -201,8 +201,7 @@ void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) {

NOTIMPLEMENTED();

}

-void MediaRouterAndroid::OnPresentationSessionDetached(

- const MediaRoute::Id& route_id) {

+void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) {

JNIEnv* env = base::android::AttachCurrentThread();

ScopedJavaLocalRef<jstring> jroute_id =

base::android::ConvertUTF8ToJavaString(env, route_id);