| 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 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" | 5 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <unordered_map> | 9 #include <unordered_map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 150 |
| 151 void MediaRouterUI::UIMediaRoutesObserver::OnRoutesUpdated( | 151 void MediaRouterUI::UIMediaRoutesObserver::OnRoutesUpdated( |
| 152 const std::vector<MediaRoute>& routes, | 152 const std::vector<MediaRoute>& routes, |
| 153 const std::vector<MediaRoute::Id>& joinable_route_ids) { | 153 const std::vector<MediaRoute::Id>& joinable_route_ids) { |
| 154 callback_.Run(routes, joinable_route_ids); | 154 callback_.Run(routes, joinable_route_ids); |
| 155 } | 155 } |
| 156 | 156 |
| 157 MediaRouterUI::UIMediaRouteControllerObserver::UIMediaRouteControllerObserver( | 157 MediaRouterUI::UIMediaRouteControllerObserver::UIMediaRouteControllerObserver( |
| 158 MediaRouterUI* ui, | 158 MediaRouterUI* ui, |
| 159 scoped_refptr<MediaRouteController> controller) | 159 scoped_refptr<MediaRouteController> controller) |
| 160 : MediaRouteController::Observer(std::move(controller)), ui_(ui) {} | 160 : MediaRouteController::Observer(std::move(controller)), ui_(ui) { |
| 161 if (controller_->current_media_status()) |
| 162 OnMediaStatusUpdated(controller_->current_media_status().value()); |
| 163 } |
| 164 |
| 161 MediaRouterUI::UIMediaRouteControllerObserver:: | 165 MediaRouterUI::UIMediaRouteControllerObserver:: |
| 162 ~UIMediaRouteControllerObserver() {} | 166 ~UIMediaRouteControllerObserver() {} |
| 163 | 167 |
| 164 void MediaRouterUI::UIMediaRouteControllerObserver::OnMediaStatusUpdated( | 168 void MediaRouterUI::UIMediaRouteControllerObserver::OnMediaStatusUpdated( |
| 165 const MediaStatus& status) { | 169 const MediaStatus& status) { |
| 166 ui_->UpdateMediaRouteStatus(status); | 170 ui_->UpdateMediaRouteStatus(status); |
| 167 } | 171 } |
| 168 | 172 |
| 169 void MediaRouterUI::UIMediaRouteControllerObserver::OnControllerInvalidated() { | 173 void MediaRouterUI::UIMediaRouteControllerObserver::OnControllerInvalidated() { |
| 170 ui_->OnRouteControllerInvalidated(); | 174 ui_->OnRouteControllerInvalidated(); |
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 811 } | 815 } |
| 812 | 816 |
| 813 std::string MediaRouterUI::GetSerializedInitiatorOrigin() const { | 817 std::string MediaRouterUI::GetSerializedInitiatorOrigin() const { |
| 814 url::Origin origin = initiator_ | 818 url::Origin origin = initiator_ |
| 815 ? url::Origin(initiator_->GetLastCommittedURL()) | 819 ? url::Origin(initiator_->GetLastCommittedURL()) |
| 816 : url::Origin(); | 820 : url::Origin(); |
| 817 return origin.Serialize(); | 821 return origin.Serialize(); |
| 818 } | 822 } |
| 819 | 823 |
| 820 } // namespace media_router | 824 } // namespace media_router |
| OLD | NEW |