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

Side by Side Diff: chrome/browser/media/android/router/media_router_android.cc

Issue 1821823002: [Media Router] Conditionally enable mDNS on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Semicolon for Windows code Created 4 years, 8 months 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 <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 } 237 }
238 238
239 void MediaRouterAndroid::AddIssue(const Issue& issue) { 239 void MediaRouterAndroid::AddIssue(const Issue& issue) {
240 NOTIMPLEMENTED(); 240 NOTIMPLEMENTED();
241 } 241 }
242 242
243 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) { 243 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) {
244 NOTIMPLEMENTED(); 244 NOTIMPLEMENTED();
245 } 245 }
246 246
247 void MediaRouterAndroid::OnUserGesture() {
248 }
249
247 void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) { 250 void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) {
248 JNIEnv* env = base::android::AttachCurrentThread(); 251 JNIEnv* env = base::android::AttachCurrentThread();
249 ScopedJavaLocalRef<jstring> jroute_id = 252 ScopedJavaLocalRef<jstring> jroute_id =
250 base::android::ConvertUTF8ToJavaString(env, route_id); 253 base::android::ConvertUTF8ToJavaString(env, route_id);
251 Java_ChromeMediaRouter_detachRoute( 254 Java_ChromeMediaRouter_detachRoute(
252 env, java_media_router_.obj(), jroute_id.obj()); 255 env, java_media_router_.obj(), jroute_id.obj());
253 } 256 }
254 257
255 bool MediaRouterAndroid::RegisterMediaSinksObserver( 258 bool MediaRouterAndroid::RegisterMediaSinksObserver(
256 MediaSinksObserver* observer) { 259 MediaSinksObserver* observer) {
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 scoped_ptr<content::PresentationSessionMessage> message( 463 scoped_ptr<content::PresentationSessionMessage> message(
461 new content::PresentationSessionMessage(content::TEXT)); 464 new content::PresentationSessionMessage(content::TEXT));
462 message->message = ConvertJavaStringToUTF8(env, jmessage); 465 message->message = ConvertJavaStringToUTF8(env, jmessage);
463 session_messages.push_back(std::move(message)); 466 session_messages.push_back(std::move(message));
464 467
465 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, 468 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list,
466 OnMessagesReceived(session_messages, true)); 469 OnMessagesReceived(session_messages, true));
467 } 470 }
468 471
469 } // namespace media_router 472 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698