Chromium Code Reviews| 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..cd61b8a4f250919bc15448de5de9fb7671a0c035 100644 |
| --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc |
| +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc |
| @@ -17,6 +17,7 @@ |
| #include "base/strings/stringprintf.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" |
| #include "chrome/browser/media/router/media_routes_observer.h" |
| #include "chrome/browser/media/router/media_sinks_observer.h" |
| #include "chrome/browser/media/router/mojo/media_route_controller.h" |
| @@ -152,7 +153,11 @@ 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_); |
| + |
| + auto config = mojom::MediaRouteProviderConfig::New(); |
| + config->enable_dial_discovery = !media_router::DialLocalDiscoveryEnabled(); |
|
dcheng
2017/05/11 20:43:23
Are these booleans backwards?
zhaobin
2017/05/11 20:48:34
On purpose. media_router::DialLocalDiscoveryEnable
|
| + config->enable_cast_discovery = !media_router::CastDiscoveryEnabled(); |
| + callback.Run(instance_id_, std::move(config)); |
| ExecutePendingRequests(); |
| SyncStateToMediaRouteProvider(); |