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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/media/android/router/media_router_android.h" 5 #include "chrome/browser/media/android/router/media_router_android.h"
6 6
7 #include "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 Java_ChromeMediaRouter_joinRoute( 143 Java_ChromeMediaRouter_joinRoute(
144 env, 144 env,
145 java_media_router_.obj(), 145 java_media_router_.obj(),
146 jsource_id.obj(), 146 jsource_id.obj(),
147 jpresentation_id.obj(), 147 jpresentation_id.obj(),
148 jorigin.obj(), 148 jorigin.obj(),
149 tab_id, 149 tab_id,
150 request_id); 150 request_id);
151 } 151 }
152 152
153 void MediaRouterAndroid::CloseRoute(const MediaRoute::Id& route_id) { 153 void MediaRouterAndroid::TerminateRoute(const MediaRoute::Id& route_id) {
154 JNIEnv* env = base::android::AttachCurrentThread(); 154 JNIEnv* env = base::android::AttachCurrentThread();
155 ScopedJavaLocalRef<jstring> jroute_id = 155 ScopedJavaLocalRef<jstring> jroute_id =
156 base::android::ConvertUTF8ToJavaString(env, route_id); 156 base::android::ConvertUTF8ToJavaString(env, route_id);
157 Java_ChromeMediaRouter_closeRoute( 157 Java_ChromeMediaRouter_closeRoute(
158 env, java_media_router_.obj(), jroute_id.obj()); 158 env, java_media_router_.obj(), jroute_id.obj());
159 } 159 }
160 160
161 void MediaRouterAndroid::SendRouteMessage( 161 void MediaRouterAndroid::SendRouteMessage(
162 const MediaRoute::Id& route_id, 162 const MediaRoute::Id& route_id,
163 const std::string& message, 163 const std::string& message,
(...skipping 30 matching lines...) Expand all
194 } 194 }
195 195
196 void MediaRouterAndroid::AddIssue(const Issue& issue) { 196 void MediaRouterAndroid::AddIssue(const Issue& issue) {
197 NOTIMPLEMENTED(); 197 NOTIMPLEMENTED();
198 } 198 }
199 199
200 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) { 200 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) {
201 NOTIMPLEMENTED(); 201 NOTIMPLEMENTED();
202 } 202 }
203 203
204 void MediaRouterAndroid::OnPresentationSessionDetached( 204 void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) {
205 const MediaRoute::Id& route_id) {
206 JNIEnv* env = base::android::AttachCurrentThread(); 205 JNIEnv* env = base::android::AttachCurrentThread();
207 ScopedJavaLocalRef<jstring> jroute_id = 206 ScopedJavaLocalRef<jstring> jroute_id =
208 base::android::ConvertUTF8ToJavaString(env, route_id); 207 base::android::ConvertUTF8ToJavaString(env, route_id);
209 Java_ChromeMediaRouter_detachRoute( 208 Java_ChromeMediaRouter_detachRoute(
210 env, java_media_router_.obj(), jroute_id.obj()); 209 env, java_media_router_.obj(), jroute_id.obj());
211 } 210 }
212 211
213 bool MediaRouterAndroid::HasLocalDisplayRoute() const { 212 bool MediaRouterAndroid::HasLocalDisplayRoute() const {
214 NOTIMPLEMENTED(); 213 NOTIMPLEMENTED();
215 return false; 214 return false;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 scoped_ptr<content::PresentationSessionMessage> message( 417 scoped_ptr<content::PresentationSessionMessage> message(
419 new content::PresentationSessionMessage(content::TEXT)); 418 new content::PresentationSessionMessage(content::TEXT));
420 message->message = ConvertJavaStringToUTF8(env, jmessage); 419 message->message = ConvertJavaStringToUTF8(env, jmessage);
421 session_messages.push_back(message.Pass()); 420 session_messages.push_back(message.Pass());
422 421
423 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, 422 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list,
424 OnMessagesReceived(session_messages, true)); 423 OnMessagesReceived(session_messages, true));
425 } 424 }
426 425
427 } // namespace media_router 426 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698