| 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/media/router/mojo/media_router_mojo_impl.h" | 5 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/media/router/media_router_feature.h" | 23 #include "chrome/browser/media/router/media_router_feature.h" |
| 24 #include "chrome/browser/media/router/media_routes_observer.h" | 24 #include "chrome/browser/media/router/media_routes_observer.h" |
| 25 #include "chrome/browser/media/router/media_sinks_observer.h" | 25 #include "chrome/browser/media/router/media_sinks_observer.h" |
| 26 #include "chrome/browser/media/router/mojo/media_route_controller.h" | 26 #include "chrome/browser/media/router/mojo/media_route_controller.h" |
| 27 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h" | 27 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h" |
| 28 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h" | 28 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h" |
| 29 #include "chrome/browser/media/router/route_message_observer.h" | 29 #include "chrome/browser/media/router/route_message_observer.h" |
| 30 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
| 31 #include "chrome/browser/sessions/session_tab_helper.h" | 31 #include "chrome/browser/sessions/session_tab_helper.h" |
| 32 #include "chrome/common/media_router/media_source_helper.h" | 32 #include "chrome/common/media_router/media_source_helper.h" |
| 33 #include "chrome/common/media_router/route_message.h" | |
| 34 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
| 34 #include "content/public/common/presentation_connection_message.h" |
| 35 #include "extensions/common/extension.h" | 35 #include "extensions/common/extension.h" |
| 36 | 36 |
| 37 #define DVLOG_WITH_INSTANCE(level) \ | 37 #define DVLOG_WITH_INSTANCE(level) \ |
| 38 DVLOG(level) << "MR #" << instance_id_ << ": " | 38 DVLOG(level) << "MR #" << instance_id_ << ": " |
| 39 | 39 |
| 40 #define DLOG_WITH_INSTANCE(level) DLOG(level) << "MR #" << instance_id_ << ": " | 40 #define DLOG_WITH_INSTANCE(level) DLOG(level) << "MR #" << instance_id_ << ": " |
| 41 | 41 |
| 42 namespace media_router { | 42 namespace media_router { |
| 43 | 43 |
| 44 namespace { | 44 namespace { |
| (...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 | 772 |
| 773 media_route_provider_->CreateMediaRouteController( | 773 media_route_provider_->CreateMediaRouteController( |
| 774 route_id, std::move(mojo_media_controller_request), | 774 route_id, std::move(mojo_media_controller_request), |
| 775 std::move(mojo_observer), | 775 std::move(mojo_observer), |
| 776 base::Bind(&MediaRouterMojoImpl::OnMediaControllerCreated, | 776 base::Bind(&MediaRouterMojoImpl::OnMediaControllerCreated, |
| 777 base::Unretained(this), route_id)); | 777 base::Unretained(this), route_id)); |
| 778 } | 778 } |
| 779 | 779 |
| 780 void MediaRouterMojoImpl::OnRouteMessagesReceived( | 780 void MediaRouterMojoImpl::OnRouteMessagesReceived( |
| 781 const std::string& route_id, | 781 const std::string& route_id, |
| 782 const std::vector<RouteMessage>& messages) { | 782 const std::vector<content::PresentationConnectionMessage>& messages) { |
| 783 DVLOG_WITH_INSTANCE(1) << "OnRouteMessagesReceived"; | 783 DVLOG_WITH_INSTANCE(1) << "OnRouteMessagesReceived"; |
| 784 | 784 |
| 785 if (messages.empty()) | 785 if (messages.empty()) |
| 786 return; | 786 return; |
| 787 | 787 |
| 788 auto it = message_observers_.find(route_id); | 788 auto it = message_observers_.find(route_id); |
| 789 if (it == message_observers_.end()) { | 789 if (it == message_observers_.end()) { |
| 790 return; | 790 return; |
| 791 } | 791 } |
| 792 | 792 |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1015 | 1015 |
| 1016 void MediaRouterMojoImpl::OnMediaControllerCreated( | 1016 void MediaRouterMojoImpl::OnMediaControllerCreated( |
| 1017 const MediaRoute::Id& route_id, | 1017 const MediaRoute::Id& route_id, |
| 1018 bool success) { | 1018 bool success) { |
| 1019 DVLOG_WITH_INSTANCE(1) << "OnMediaControllerCreated: " << route_id | 1019 DVLOG_WITH_INSTANCE(1) << "OnMediaControllerCreated: " << route_id |
| 1020 << (success ? " was successful." : " failed."); | 1020 << (success ? " was successful." : " failed."); |
| 1021 MediaRouterMojoMetrics::RecordMediaRouteControllerCreationResult(success); | 1021 MediaRouterMojoMetrics::RecordMediaRouteControllerCreationResult(success); |
| 1022 } | 1022 } |
| 1023 | 1023 |
| 1024 } // namespace media_router | 1024 } // namespace media_router |
| OLD | NEW |