| 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_ROUTER_MEDIA_ROUTER_BASE_H_ | 5 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_ |
| 6 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_ | 6 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 std::unique_ptr<PresentationConnectionStateSubscription> | 25 std::unique_ptr<PresentationConnectionStateSubscription> |
| 26 AddPresentationConnectionStateChangedCallback( | 26 AddPresentationConnectionStateChangedCallback( |
| 27 const MediaRoute::Id& route_id, | 27 const MediaRoute::Id& route_id, |
| 28 const content::PresentationConnectionStateChangedCallback& callback) | 28 const content::PresentationConnectionStateChangedCallback& callback) |
| 29 override; | 29 override; |
| 30 | 30 |
| 31 // Called when the incognito profile for this instance is being shut down. | 31 // Called when the incognito profile for this instance is being shut down. |
| 32 // This will terminate all incognito media routes. | 32 // This will terminate all incognito media routes. |
| 33 void OnIncognitoProfileShutdown() override; | 33 void OnIncognitoProfileShutdown() override; |
| 34 | 34 |
| 35 std::vector<MediaRoute> GetCurrentRoutes() const override; |
| 36 |
| 35 protected: | 37 protected: |
| 36 FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest, | 38 FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest, |
| 37 PresentationConnectionStateChangedCallback); | 39 PresentationConnectionStateChangedCallback); |
| 38 FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest, | 40 FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest, |
| 39 PresentationConnectionStateChangedCallbackRemoved); | 41 PresentationConnectionStateChangedCallbackRemoved); |
| 40 FRIEND_TEST_ALL_PREFIXES(MediaRouterBaseTest, CreatePresentationIds); | 42 FRIEND_TEST_ALL_PREFIXES(MediaRouterBaseTest, CreatePresentationIds); |
| 41 FRIEND_TEST_ALL_PREFIXES(MediaRouterBaseTest, NotifyCallbacks); | 43 FRIEND_TEST_ALL_PREFIXES(MediaRouterBaseTest, NotifyCallbacks); |
| 42 | 44 |
| 43 MediaRouterBase(); | 45 MediaRouterBase(); |
| 44 | 46 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 86 |
| 85 std::unique_ptr<InternalMediaRoutesObserver> internal_routes_observer_; | 87 std::unique_ptr<InternalMediaRoutesObserver> internal_routes_observer_; |
| 86 bool initialized_; | 88 bool initialized_; |
| 87 | 89 |
| 88 DISALLOW_COPY_AND_ASSIGN(MediaRouterBase); | 90 DISALLOW_COPY_AND_ASSIGN(MediaRouterBase); |
| 89 }; | 91 }; |
| 90 | 92 |
| 91 } // namespace media_router | 93 } // namespace media_router |
| 92 | 94 |
| 93 #endif // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_ | 95 #endif // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_BASE_H_ |
| OLD | NEW |