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_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_ |
6 #define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 | 148 |
149 // Called to track UI metrics. | 149 // Called to track UI metrics. |
150 void SetUIInitializationTimer(const base::Time& start_time); | 150 void SetUIInitializationTimer(const base::Time& start_time); |
151 void OnUIInitiallyLoaded(); | 151 void OnUIInitiallyLoaded(); |
152 void OnUIInitialDataReceived(); | 152 void OnUIInitialDataReceived(); |
153 | 153 |
154 void UpdateMaxDialogHeight(int height); | 154 void UpdateMaxDialogHeight(int height); |
155 | 155 |
156 void InitForTest(MediaRouter* router, | 156 void InitForTest(MediaRouter* router, |
157 content::WebContents* initiator, | 157 content::WebContents* initiator, |
158 MediaRouterWebUIMessageHandler* handler); | 158 MediaRouterWebUIMessageHandler* handler, |
| 159 std::unique_ptr<CreatePresentationConnectionRequest> |
| 160 create_session_request); |
159 | 161 |
160 private: | 162 private: |
161 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, SortedSinks); | 163 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, SortedSinks); |
162 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, | 164 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, |
163 UIMediaRoutesObserverFiltersNonDisplayRoutes); | 165 UIMediaRoutesObserverFiltersNonDisplayRoutes); |
164 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, | 166 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, |
165 UIMediaRoutesObserverFiltersNonDisplayJoinableRoutes); | 167 UIMediaRoutesObserverFiltersNonDisplayJoinableRoutes); |
166 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, | 168 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, |
167 UIMediaRoutesObserverAssignsCurrentCastModes); | 169 UIMediaRoutesObserverAssignsCurrentCastModes); |
168 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, | 170 FRIEND_TEST_ALL_PREFIXES(MediaRouterUITest, |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 // NOTE: Weak pointers must be invalidated before all other member variables. | 332 // NOTE: Weak pointers must be invalidated before all other member variables. |
331 // Therefore |weak_factory_| must be placed at the end. | 333 // Therefore |weak_factory_| must be placed at the end. |
332 base::WeakPtrFactory<MediaRouterUI> weak_factory_; | 334 base::WeakPtrFactory<MediaRouterUI> weak_factory_; |
333 | 335 |
334 DISALLOW_COPY_AND_ASSIGN(MediaRouterUI); | 336 DISALLOW_COPY_AND_ASSIGN(MediaRouterUI); |
335 }; | 337 }; |
336 | 338 |
337 } // namespace media_router | 339 } // namespace media_router |
338 | 340 |
339 #endif // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_ | 341 #endif // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_ |
OLD | NEW |