| Index: chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| index 9b778029530627e63ca792ea57f11021be4dd65d..1c17a69d529f1d1e8c14c84dab411a25b806d075 100644
|
| --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| @@ -15,6 +15,7 @@
|
| #include "base/observer_list.h"
|
| #include "base/stl_util.h"
|
| #include "base/strings/stringprintf.h"
|
| +#include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_delegate.h"
|
| #include "chrome/browser/media/router/issues_observer.h"
|
| #include "chrome/browser/media/router/media_router_factory.h"
|
| #include "chrome/browser/media/router/media_routes_observer.h"
|
| @@ -23,6 +24,7 @@
|
| #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h"
|
| #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h"
|
| #include "chrome/browser/media/router/route_message_observer.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/sessions/session_tab_helper.h"
|
| #include "chrome/common/media_router/media_source_helper.h"
|
| #include "chrome/common/media_router/route_message.h"
|
| @@ -58,11 +60,13 @@ MediaRouterMojoImpl::MediaSinksQuery::MediaSinksQuery() = default;
|
| MediaRouterMojoImpl::MediaSinksQuery::~MediaSinksQuery() = default;
|
|
|
| MediaRouterMojoImpl::MediaRouterMojoImpl(
|
| - extensions::EventPageTracker* event_page_tracker)
|
| + extensions::EventPageTracker* event_page_tracker,
|
| + content::BrowserContext* context)
|
| : event_page_tracker_(event_page_tracker),
|
| instance_id_(base::GenerateGUID()),
|
| availability_(mojom::MediaRouter::SinkAvailability::UNAVAILABLE),
|
| current_wake_reason_(MediaRouteProviderWakeReason::TOTAL_COUNT),
|
| + context_(context),
|
| weak_factory_(this) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| DCHECK(event_page_tracker_);
|
| @@ -75,6 +79,8 @@ MediaRouterMojoImpl::MediaRouterMojoImpl(
|
|
|
| MediaRouterMojoImpl::~MediaRouterMojoImpl() {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| + if (dial_media_sink_service_delegate_)
|
| + dial_media_sink_service_delegate_->Stop();
|
| }
|
|
|
| // static
|
| @@ -152,6 +158,7 @@ void MediaRouterMojoImpl::RegisterMediaRouteProvider(
|
| media_route_provider_ = std::move(media_route_provider_ptr);
|
| media_route_provider_.set_connection_error_handler(base::Bind(
|
| &MediaRouterMojoImpl::OnConnectionError, base::Unretained(this)));
|
| +
|
| callback.Run(instance_id_);
|
| ExecutePendingRequests();
|
| SyncStateToMediaRouteProvider();
|
| @@ -423,6 +430,8 @@ void MediaRouterMojoImpl::ProvideSinks(
|
| const std::string& provider_name,
|
| const std::vector<MediaSinkInternal>& sinks) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| + DVLOG_WITH_INSTANCE(1) << "OnDialMediaSinkDiscovered found " << sinks.size()
|
| + << " devices...";
|
|
|
| SetWakeReason(MediaRouteProviderWakeReason::PROVIDE_SINKS);
|
| RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoProvideSinks,
|
| @@ -1062,6 +1071,24 @@ void MediaRouterMojoImpl::OnFirewallCheckComplete(
|
| }
|
| #endif
|
|
|
| +void MediaRouterMojoImpl::StartDiscovery() {
|
| + DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| + DVLOG_WITH_INSTANCE(1) << "StartDiscovery";
|
| +
|
| + if (dial_media_sink_service_delegate_)
|
| + return;
|
| +
|
| + auto* profile = Profile::FromBrowserContext(context_);
|
| + if (!profile)
|
| + return;
|
| +
|
| + dial_media_sink_service_delegate_ = new DialMediaSinkServiceDelegate();
|
| + dial_media_sink_service_delegate_->Start(
|
| + base::Bind(&MediaRouterMojoImpl::ProvideSinks, base::Unretained(this),
|
| + "dial"),
|
| + profile->GetRequestContext());
|
| +}
|
| +
|
| void MediaRouterMojoImpl::UpdateMediaSinks(
|
| const MediaSource::Id& source_id) {
|
| SetWakeReason(MediaRouteProviderWakeReason::UPDATE_MEDIA_SINKS);
|
|
|