Chromium Code Reviews| 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/media_router_mojo_impl.h" | 5 #include "chrome/browser/media/router/media_router_mojo_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/guid.h" | 11 #include "base/guid.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/memory/scoped_vector.h" | 13 #include "base/memory/scoped_vector.h" |
| 14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
| 15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
| 16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
| 17 #include "build/build_config.h" | |
| 17 #include "chrome/browser/media/router/issues_observer.h" | 18 #include "chrome/browser/media/router/issues_observer.h" |
| 19 #include "chrome/browser/media/router/media_route_provider_util.h" | |
| 18 #include "chrome/browser/media/router/media_router_factory.h" | 20 #include "chrome/browser/media/router/media_router_factory.h" |
| 19 #include "chrome/browser/media/router/media_router_metrics.h" | 21 #include "chrome/browser/media/router/media_router_metrics.h" |
| 20 #include "chrome/browser/media/router/media_router_type_converters.h" | 22 #include "chrome/browser/media/router/media_router_type_converters.h" |
| 21 #include "chrome/browser/media/router/media_routes_observer.h" | 23 #include "chrome/browser/media/router/media_routes_observer.h" |
| 22 #include "chrome/browser/media/router/media_sinks_observer.h" | 24 #include "chrome/browser/media/router/media_sinks_observer.h" |
| 23 #include "chrome/browser/media/router/presentation_session_messages_observer.h" | 25 #include "chrome/browser/media/router/presentation_session_messages_observer.h" |
| 24 #include "chrome/browser/sessions/session_tab_helper.h" | 26 #include "chrome/browser/sessions/session_tab_helper.h" |
| 25 #include "extensions/browser/process_manager.h" | 27 #include "extensions/browser/process_manager.h" |
| 26 | 28 |
| 27 #define DVLOG_WITH_INSTANCE(level) \ | 29 #define DVLOG_WITH_INSTANCE(level) \ |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 MediaRouterMojoImpl::MediaSinksQuery::~MediaSinksQuery() = default; | 76 MediaRouterMojoImpl::MediaSinksQuery::~MediaSinksQuery() = default; |
| 75 | 77 |
| 76 MediaRouterMojoImpl::MediaRouterMojoImpl( | 78 MediaRouterMojoImpl::MediaRouterMojoImpl( |
| 77 extensions::EventPageTracker* event_page_tracker) | 79 extensions::EventPageTracker* event_page_tracker) |
| 78 : event_page_tracker_(event_page_tracker), | 80 : event_page_tracker_(event_page_tracker), |
| 79 instance_id_(base::GenerateGUID()), | 81 instance_id_(base::GenerateGUID()), |
| 80 availability_(interfaces::MediaRouter::SinkAvailability::UNAVAILABLE), | 82 availability_(interfaces::MediaRouter::SinkAvailability::UNAVAILABLE), |
| 81 current_wake_reason_(MediaRouteProviderWakeReason::TOTAL_COUNT), | 83 current_wake_reason_(MediaRouteProviderWakeReason::TOTAL_COUNT), |
| 82 weak_factory_(this) { | 84 weak_factory_(this) { |
| 83 DCHECK(event_page_tracker_); | 85 DCHECK(event_page_tracker_); |
| 86 #if defined(OS_WIN) | |
| 87 should_enable_mdns_discovery_ = false; | |
| 88 CanFirewallUseLocalPorts(this); | |
| 89 #endif | |
| 84 } | 90 } |
| 85 | 91 |
| 86 MediaRouterMojoImpl::~MediaRouterMojoImpl() { | 92 MediaRouterMojoImpl::~MediaRouterMojoImpl() { |
| 87 DCHECK(thread_checker_.CalledOnValidThread()); | 93 DCHECK(thread_checker_.CalledOnValidThread()); |
| 88 } | 94 } |
| 89 | 95 |
| 90 // static | 96 // static |
| 91 void MediaRouterMojoImpl::BindToRequest( | 97 void MediaRouterMojoImpl::BindToRequest( |
| 92 const extensions::Extension* extension, | 98 const extensions::Extension* extension, |
| 93 content::BrowserContext* context, | 99 content::BrowserContext* context, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 AttemptWakeEventPage(); | 156 AttemptWakeEventPage(); |
| 151 return; | 157 return; |
| 152 } | 158 } |
| 153 | 159 |
| 154 media_route_provider_ = std::move(media_route_provider_ptr); | 160 media_route_provider_ = std::move(media_route_provider_ptr); |
| 155 media_route_provider_.set_connection_error_handler(base::Bind( | 161 media_route_provider_.set_connection_error_handler(base::Bind( |
| 156 &MediaRouterMojoImpl::OnConnectionError, base::Unretained(this))); | 162 &MediaRouterMojoImpl::OnConnectionError, base::Unretained(this))); |
| 157 callback.Run(instance_id_); | 163 callback.Run(instance_id_); |
| 158 ExecutePendingRequests(); | 164 ExecutePendingRequests(); |
| 159 wakeup_attempt_count_ = 0; | 165 wakeup_attempt_count_ = 0; |
| 166 #if defined(OS_WIN) | |
| 167 if (should_enable_mdns_discovery_) { | |
| 168 media_route_provider_->EnableMdnsDiscovery(); | |
| 169 } | |
| 170 #endif | |
| 160 } | 171 } |
| 161 | 172 |
| 162 void MediaRouterMojoImpl::OnIssue(const interfaces::IssuePtr issue) { | 173 void MediaRouterMojoImpl::OnIssue(const interfaces::IssuePtr issue) { |
| 163 DCHECK(thread_checker_.CalledOnValidThread()); | 174 DCHECK(thread_checker_.CalledOnValidThread()); |
| 164 DVLOG_WITH_INSTANCE(1) << "OnIssue " << issue->title; | 175 DVLOG_WITH_INSTANCE(1) << "OnIssue " << issue->title; |
| 165 const Issue& issue_converted = issue.To<Issue>(); | 176 const Issue& issue_converted = issue.To<Issue>(); |
| 166 issue_manager_.AddIssue(issue_converted); | 177 issue_manager_.AddIssue(issue_converted); |
| 167 } | 178 } |
| 168 | 179 |
| 169 void MediaRouterMojoImpl::OnSinksReceived( | 180 void MediaRouterMojoImpl::OnSinksReceived( |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 395 void MediaRouterMojoImpl::AddIssue(const Issue& issue) { | 406 void MediaRouterMojoImpl::AddIssue(const Issue& issue) { |
| 396 DCHECK(thread_checker_.CalledOnValidThread()); | 407 DCHECK(thread_checker_.CalledOnValidThread()); |
| 397 issue_manager_.AddIssue(issue); | 408 issue_manager_.AddIssue(issue); |
| 398 } | 409 } |
| 399 | 410 |
| 400 void MediaRouterMojoImpl::ClearIssue(const Issue::Id& issue_id) { | 411 void MediaRouterMojoImpl::ClearIssue(const Issue::Id& issue_id) { |
| 401 DCHECK(thread_checker_.CalledOnValidThread()); | 412 DCHECK(thread_checker_.CalledOnValidThread()); |
| 402 issue_manager_.ClearIssue(issue_id); | 413 issue_manager_.ClearIssue(issue_id); |
| 403 } | 414 } |
| 404 | 415 |
| 416 bool MediaRouterMojoImpl::should_enable_mdns_discovery() const { | |
| 417 return should_enable_mdns_discovery_; | |
|
mark a. foltz
2016/03/24 22:59:33
This can be inlined into the .h
btolsch
2016/03/25 04:40:50
This is a virtual and can't be defined inline.
| |
| 418 } | |
| 419 | |
| 420 void MediaRouterMojoImpl::EnableMdnsDiscovery() { | |
| 421 if (media_route_provider_) { | |
| 422 media_route_provider_->EnableMdnsDiscovery(); | |
| 423 } | |
| 424 should_enable_mdns_discovery_ = true; | |
| 425 } | |
| 426 | |
| 405 bool MediaRouterMojoImpl::RegisterMediaSinksObserver( | 427 bool MediaRouterMojoImpl::RegisterMediaSinksObserver( |
| 406 MediaSinksObserver* observer) { | 428 MediaSinksObserver* observer) { |
| 407 DCHECK(thread_checker_.CalledOnValidThread()); | 429 DCHECK(thread_checker_.CalledOnValidThread()); |
| 408 | 430 |
| 409 // Create an observer list for the media source and add |observer| | 431 // Create an observer list for the media source and add |observer| |
| 410 // to it. Fail if |observer| is already registered. | 432 // to it. Fail if |observer| is already registered. |
| 411 const std::string& source_id = observer->source().id(); | 433 const std::string& source_id = observer->source().id(); |
| 412 auto* sinks_query = sinks_queries_.get(source_id); | 434 auto* sinks_query = sinks_queries_.get(source_id); |
| 413 bool new_query = false; | 435 bool new_query = false; |
| 414 if (!sinks_query) { | 436 if (!sinks_query) { |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 924 if (current_wake_reason_ == MediaRouteProviderWakeReason::TOTAL_COUNT) | 946 if (current_wake_reason_ == MediaRouteProviderWakeReason::TOTAL_COUNT) |
| 925 current_wake_reason_ = reason; | 947 current_wake_reason_ = reason; |
| 926 } | 948 } |
| 927 | 949 |
| 928 void MediaRouterMojoImpl::ClearWakeReason() { | 950 void MediaRouterMojoImpl::ClearWakeReason() { |
| 929 DCHECK(current_wake_reason_ != MediaRouteProviderWakeReason::TOTAL_COUNT); | 951 DCHECK(current_wake_reason_ != MediaRouteProviderWakeReason::TOTAL_COUNT); |
| 930 current_wake_reason_ = MediaRouteProviderWakeReason::TOTAL_COUNT; | 952 current_wake_reason_ = MediaRouteProviderWakeReason::TOTAL_COUNT; |
| 931 } | 953 } |
| 932 | 954 |
| 933 } // namespace media_router | 955 } // namespace media_router |
| OLD | NEW |