Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 58 void TerminateRoute(const MediaRoute::Id& route_id) override; | 58 void TerminateRoute(const MediaRoute::Id& route_id) override; |
| 59 void SendRouteMessage(const MediaRoute::Id& route_id, | 59 void SendRouteMessage(const MediaRoute::Id& route_id, |
| 60 const std::string& message, | 60 const std::string& message, |
| 61 const SendRouteMessageCallback& callback) override; | 61 const SendRouteMessageCallback& callback) override; |
| 62 void SendRouteBinaryMessage( | 62 void SendRouteBinaryMessage( |
| 63 const MediaRoute::Id& route_id, | 63 const MediaRoute::Id& route_id, |
| 64 scoped_ptr<std::vector<uint8_t>> data, | 64 scoped_ptr<std::vector<uint8_t>> data, |
| 65 const SendRouteMessageCallback& callback) override; | 65 const SendRouteMessageCallback& callback) override; |
| 66 void AddIssue(const Issue& issue) override; | 66 void AddIssue(const Issue& issue) override; |
| 67 void ClearIssue(const Issue::Id& issue_id) override; | 67 void ClearIssue(const Issue::Id& issue_id) override; |
| 68 | 68 |
|
apacible
2016/03/23 22:04:45
nit: remove extra line here so it's obvious these
btolsch
2016/03/24 01:44:03
Done.
| |
| 69 bool is_mdns_discovery_enabled() const override; | |
| 70 void EnableMdnsDiscovery() override; | |
| 71 | |
| 69 // The methods called by the Java counterpart. | 72 // The methods called by the Java counterpart. |
| 70 | 73 |
| 71 // Notifies the media router that information about sinks is received for | 74 // Notifies the media router that information about sinks is received for |
| 72 // a specific source URN. | 75 // a specific source URN. |
| 73 void OnSinksReceived(JNIEnv* env, | 76 void OnSinksReceived(JNIEnv* env, |
| 74 const base::android::JavaParamRef<jobject>& obj, | 77 const base::android::JavaParamRef<jobject>& obj, |
| 75 const base::android::JavaParamRef<jstring>& jsource_urn, | 78 const base::android::JavaParamRef<jstring>& jsource_urn, |
| 76 jint jcount); | 79 jint jcount); |
| 77 | 80 |
| 78 // Notifies the media router about a successful route creation. | 81 // Notifies the media router about a successful route creation. |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 MediaRoute::Id, | 164 MediaRoute::Id, |
| 162 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>; | 165 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>; |
| 163 MessagesObservers messages_observers_; | 166 MessagesObservers messages_observers_; |
| 164 | 167 |
| 165 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); | 168 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); |
| 166 }; | 169 }; |
| 167 | 170 |
| 168 } // namespace media_router | 171 } // namespace media_router |
| 169 | 172 |
| 170 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ | 173 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ |
| OLD | NEW |