| 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 aaaa4264085e37f5b23b561f1976c2d33f100a9e..12a502523f4d6580d0dca4d69da15cc1ed9bf8dd 100644
|
| --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| @@ -16,6 +16,7 @@
|
| #include "base/stl_util.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.h"
|
| +#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
|
| #include "chrome/browser/media/router/issues_observer.h"
|
| #include "chrome/browser/media/router/media_router_factory.h"
|
| #include "chrome/browser/media/router/media_router_feature.h"
|
| @@ -1012,8 +1013,7 @@ void MediaRouterMojoImpl::SyncStateToMediaRouteProvider() {
|
| }
|
| #endif
|
|
|
| - if (media_router::DialLocalDiscoveryEnabled())
|
| - StartDiscovery();
|
| + StartDiscovery();
|
| }
|
|
|
| void MediaRouterMojoImpl::EventPageWakeComplete(bool success) {
|
| @@ -1083,14 +1083,25 @@ void MediaRouterMojoImpl::StartDiscovery() {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| DVLOG_WITH_INSTANCE(1) << "StartDiscovery";
|
|
|
| - if (!dial_media_sink_service_proxy_) {
|
| - dial_media_sink_service_proxy_ = new DialMediaSinkServiceProxy(
|
| - base::Bind(&MediaRouterMojoImpl::ProvideSinks,
|
| - weak_factory_.GetWeakPtr(), "dial"),
|
| - context_);
|
| + if (media_router::DialLocalDiscoveryEnabled()) {
|
| + if (!dial_media_sink_service_proxy_) {
|
| + dial_media_sink_service_proxy_ = new DialMediaSinkServiceProxy(
|
| + base::Bind(&MediaRouterMojoImpl::ProvideSinks,
|
| + weak_factory_.GetWeakPtr(), "dial"),
|
| + context_);
|
| + }
|
| + dial_media_sink_service_proxy_->Start();
|
| }
|
|
|
| - dial_media_sink_service_proxy_->Start();
|
| + if (media_router::CastDiscoveryEnabled()) {
|
| + if (!cast_media_sink_service_) {
|
| + cast_media_sink_service_ = new CastMediaSinkService(
|
| + base::Bind(&MediaRouterMojoImpl::ProvideSinks,
|
| + weak_factory_.GetWeakPtr(), "cast"),
|
| + context_);
|
| + }
|
| + cast_media_sink_service_->Start();
|
| + }
|
| }
|
|
|
| void MediaRouterMojoImpl::UpdateMediaSinks(
|
|
|