| 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 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/media/router/media_router_feature.h" | 21 #include "chrome/browser/media/router/media_router_feature.h" |
| 22 #include "chrome/browser/media/router/media_routes_observer.h" | 22 #include "chrome/browser/media/router/media_routes_observer.h" |
| 23 #include "chrome/browser/media/router/media_sinks_observer.h" | 23 #include "chrome/browser/media/router/media_sinks_observer.h" |
| 24 #include "chrome/browser/media/router/mojo/media_route_controller.h" | 24 #include "chrome/browser/media/router/mojo/media_route_controller.h" |
| 25 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h" | 25 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h" |
| 26 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h" | 26 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h" |
| 27 #include "chrome/browser/media/router/route_message_observer.h" | 27 #include "chrome/browser/media/router/route_message_observer.h" |
| 28 #include "chrome/browser/profiles/profile.h" | 28 #include "chrome/browser/profiles/profile.h" |
| 29 #include "chrome/browser/sessions/session_tab_helper.h" | 29 #include "chrome/browser/sessions/session_tab_helper.h" |
| 30 #include "chrome/common/media_router/media_source_helper.h" | 30 #include "chrome/common/media_router/media_source_helper.h" |
| 31 #include "chrome/common/media_router/route_message.h" | |
| 32 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
| 32 #include "content/public/common/presentation_connection_message.h" |
| 33 #include "extensions/browser/process_manager.h" | 33 #include "extensions/browser/process_manager.h" |
| 34 | 34 |
| 35 #define DVLOG_WITH_INSTANCE(level) \ | 35 #define DVLOG_WITH_INSTANCE(level) \ |
| 36 DVLOG(level) << "MR #" << instance_id_ << ": " | 36 DVLOG(level) << "MR #" << instance_id_ << ": " |
| 37 | 37 |
| 38 #define DLOG_WITH_INSTANCE(level) DLOG(level) << "MR #" << instance_id_ << ": " | 38 #define DLOG_WITH_INSTANCE(level) DLOG(level) << "MR #" << instance_id_ << ": " |
| 39 | 39 |
| 40 namespace media_router { | 40 namespace media_router { |
| 41 | 41 |
| 42 namespace { | 42 namespace { |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 | 777 |
| 778 media_route_provider_->CreateMediaRouteController( | 778 media_route_provider_->CreateMediaRouteController( |
| 779 route_id, std::move(mojo_media_controller_request), | 779 route_id, std::move(mojo_media_controller_request), |
| 780 std::move(mojo_observer), | 780 std::move(mojo_observer), |
| 781 base::Bind(&MediaRouterMojoImpl::OnMediaControllerCreated, | 781 base::Bind(&MediaRouterMojoImpl::OnMediaControllerCreated, |
| 782 base::Unretained(this), route_id)); | 782 base::Unretained(this), route_id)); |
| 783 } | 783 } |
| 784 | 784 |
| 785 void MediaRouterMojoImpl::OnRouteMessagesReceived( | 785 void MediaRouterMojoImpl::OnRouteMessagesReceived( |
| 786 const std::string& route_id, | 786 const std::string& route_id, |
| 787 const std::vector<RouteMessage>& messages) { | 787 const std::vector<content::PresentationConnectionMessage>& messages) { |
| 788 DVLOG_WITH_INSTANCE(1) << "OnRouteMessagesReceived"; | 788 DVLOG_WITH_INSTANCE(1) << "OnRouteMessagesReceived"; |
| 789 | 789 |
| 790 if (messages.empty()) | 790 if (messages.empty()) |
| 791 return; | 791 return; |
| 792 | 792 |
| 793 auto it = message_observers_.find(route_id); | 793 auto it = message_observers_.find(route_id); |
| 794 if (it == message_observers_.end()) { | 794 if (it == message_observers_.end()) { |
| 795 return; | 795 return; |
| 796 } | 796 } |
| 797 | 797 |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1124 | 1124 |
| 1125 void MediaRouterMojoImpl::OnMediaControllerCreated( | 1125 void MediaRouterMojoImpl::OnMediaControllerCreated( |
| 1126 const MediaRoute::Id& route_id, | 1126 const MediaRoute::Id& route_id, |
| 1127 bool success) { | 1127 bool success) { |
| 1128 DVLOG_WITH_INSTANCE(1) << "OnMediaControllerCreated: " << route_id | 1128 DVLOG_WITH_INSTANCE(1) << "OnMediaControllerCreated: " << route_id |
| 1129 << (success ? " was successful." : " failed."); | 1129 << (success ? " was successful." : " failed."); |
| 1130 MediaRouterMojoMetrics::RecordMediaRouteControllerCreationResult(success); | 1130 MediaRouterMojoMetrics::RecordMediaRouteControllerCreationResult(success); |
| 1131 } | 1131 } |
| 1132 | 1132 |
| 1133 } // namespace media_router | 1133 } // namespace media_router |
| OLD | NEW |