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

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

Issue 1383653002: MediaRouterAction: Only observe Media Routes when there is a local route. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/media/android/router/media_router_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 5 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 void SendRouteMessage(const MediaRoute::Id& route_id, 44 void SendRouteMessage(const MediaRoute::Id& route_id,
45 const std::string& message, 45 const std::string& message,
46 const SendRouteMessageCallback& callback) override; 46 const SendRouteMessageCallback& callback) override;
47 void SendRouteBinaryMessage( 47 void SendRouteBinaryMessage(
48 const MediaRoute::Id& route_id, 48 const MediaRoute::Id& route_id,
49 scoped_ptr<std::vector<uint8>> data, 49 scoped_ptr<std::vector<uint8>> data,
50 const SendRouteMessageCallback& callback) override; 50 const SendRouteMessageCallback& callback) override;
51 void AddIssue(const Issue& issue) override; 51 void AddIssue(const Issue& issue) override;
52 void ClearIssue(const Issue::Id& issue_id) override; 52 void ClearIssue(const Issue::Id& issue_id) override;
53 void OnPresentationSessionDetached(const MediaRoute::Id& route_id) override; 53 void OnPresentationSessionDetached(const MediaRoute::Id& route_id) override;
54 bool HasLocalRoute() const override;
54 55
55 // The methods called by the Java counterpart. 56 // The methods called by the Java counterpart.
56 57
57 // Notifies the media router that information about sinks is received for 58 // Notifies the media router that information about sinks is received for
58 // a specific source URN. 59 // a specific source URN.
59 void OnSinksReceived( 60 void OnSinksReceived(
60 JNIEnv* env, jobject obj, jstring jsource_urn, jint jcount); 61 JNIEnv* env, jobject obj, jstring jsource_urn, jint jcount);
61 62
62 // Notifies the media router about a successful route creation. 63 // Notifies the media router about a successful route creation.
63 void OnRouteCreated( 64 void OnRouteCreated(
(...skipping 30 matching lines...) Expand all
94 bool RegisterMediaSinksObserver(MediaSinksObserver* observer) override; 95 bool RegisterMediaSinksObserver(MediaSinksObserver* observer) override;
95 void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override; 96 void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override;
96 void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override; 97 void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
97 void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override; 98 void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
98 void RegisterIssuesObserver(IssuesObserver* observer) override; 99 void RegisterIssuesObserver(IssuesObserver* observer) override;
99 void UnregisterIssuesObserver(IssuesObserver* observer) override; 100 void UnregisterIssuesObserver(IssuesObserver* observer) override;
100 void RegisterPresentationSessionMessagesObserver( 101 void RegisterPresentationSessionMessagesObserver(
101 PresentationSessionMessagesObserver* observer) override; 102 PresentationSessionMessagesObserver* observer) override;
102 void UnregisterPresentationSessionMessagesObserver( 103 void UnregisterPresentationSessionMessagesObserver(
103 PresentationSessionMessagesObserver* observer) override; 104 PresentationSessionMessagesObserver* observer) override;
105 void RegisterLocalMediaRoutesObserver(
106 LocalMediaRoutesObserver* observer) override;
107 void UnregisterLocalMediaRoutesObserver(
108 LocalMediaRoutesObserver* observer) override;
104 109
105 base::android::ScopedJavaGlobalRef<jobject> java_media_router_; 110 base::android::ScopedJavaGlobalRef<jobject> java_media_router_;
106 111
107 using MediaSinkObservers = base::ScopedPtrHashMap< 112 using MediaSinkObservers = base::ScopedPtrHashMap<
108 MediaSource::Id, 113 MediaSource::Id,
109 scoped_ptr<base::ObserverList<MediaSinksObserver>>>; 114 scoped_ptr<base::ObserverList<MediaSinksObserver>>>;
110 MediaSinkObservers sinks_observers_; 115 MediaSinkObservers sinks_observers_;
111 116
112 base::ObserverList<MediaRoutesObserver> routes_observers_; 117 base::ObserverList<MediaRoutesObserver> routes_observers_;
113 118
(...skipping 25 matching lines...) Expand all
139 MediaRoute::Id, 144 MediaRoute::Id,
140 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>; 145 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>;
141 MessagesObservers messages_observers_; 146 MessagesObservers messages_observers_;
142 147
143 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); 148 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
144 }; 149 };
145 150
146 } // namespace media_router 151 } // namespace media_router
147 152
148 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 153 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/android/router/media_router_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698