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

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: 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
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 void RegisterMediaSinksObserver(MediaSinksObserver* observer) override; 94 void RegisterMediaSinksObserver(MediaSinksObserver* observer) override;
95 void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override; 95 void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override;
96 void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override; 96 void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
97 void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override; 97 void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
98 void RegisterIssuesObserver(IssuesObserver* observer) override; 98 void RegisterIssuesObserver(IssuesObserver* observer) override;
99 void UnregisterIssuesObserver(IssuesObserver* observer) override; 99 void UnregisterIssuesObserver(IssuesObserver* observer) override;
100 void RegisterPresentationSessionMessagesObserver( 100 void RegisterPresentationSessionMessagesObserver(
101 PresentationSessionMessagesObserver* observer) override; 101 PresentationSessionMessagesObserver* observer) override;
102 void UnregisterPresentationSessionMessagesObserver( 102 void UnregisterPresentationSessionMessagesObserver(
103 PresentationSessionMessagesObserver* observer) override; 103 PresentationSessionMessagesObserver* observer) override;
104 void RegisterLocalMediaRoutesObserver(
105 LocalMediaRoutesObserver* observer) override;
106 void UnregisterLocalMediaRoutesObserver(
107 LocalMediaRoutesObserver* observer) override;
104 108
105 base::android::ScopedJavaGlobalRef<jobject> java_media_router_; 109 base::android::ScopedJavaGlobalRef<jobject> java_media_router_;
106 110
107 using MediaSinkObservers = base::ScopedPtrHashMap< 111 using MediaSinkObservers = base::ScopedPtrHashMap<
108 MediaSource::Id, 112 MediaSource::Id,
109 scoped_ptr<base::ObserverList<MediaSinksObserver>>>; 113 scoped_ptr<base::ObserverList<MediaSinksObserver>>>;
110 MediaSinkObservers sinks_observers_; 114 MediaSinkObservers sinks_observers_;
111 115
112 base::ObserverList<MediaRoutesObserver> routes_observers_; 116 base::ObserverList<MediaRoutesObserver> routes_observers_;
113 117
(...skipping 25 matching lines...) Expand all
139 MediaRoute::Id, 143 MediaRoute::Id,
140 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>; 144 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>;
141 MessagesObservers messages_observers_; 145 MessagesObservers messages_observers_;
142 146
143 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); 147 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
144 }; 148 };
145 149
146 } // namespace media_router 150 } // namespace media_router
147 151
148 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 152 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698