Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2802)

Unified Diff: chrome/browser/media/router/mojo/media_router_mojo_impl.cc

Issue 2837363002: [Media Router] Use DialMediaSinkService in MediaRouterMojoImpl (Closed)
Patch Set: resolve code review comments from Mark Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d7cbb2a1857a9a1af1d2002ccaa49e7618ff8ba1..5100d56840cc85b48fde9c241ff22c76aa3f8465 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_proxy.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"
@@ -24,6 +25,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"
@@ -59,11 +61,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_);
@@ -76,6 +80,8 @@ MediaRouterMojoImpl::MediaRouterMojoImpl(
MediaRouterMojoImpl::~MediaRouterMojoImpl() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ if (dial_media_sink_service_proxy_)
+ dial_media_sink_service_proxy_->Stop();
}
// static
@@ -431,6 +437,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,
@@ -1070,6 +1078,24 @@ void MediaRouterMojoImpl::OnFirewallCheckComplete(
}
#endif
+void MediaRouterMojoImpl::StartDiscovery() {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ DVLOG_WITH_INSTANCE(1) << "StartDiscovery";
+
+ if (dial_media_sink_service_proxy_)
+ return;
+
+ auto* profile = Profile::FromBrowserContext(context_);
+ if (!profile)
+ return;
+
+ dial_media_sink_service_proxy_ = new DialMediaSinkServiceProxy(
+ base::Bind(&MediaRouterMojoImpl::ProvideSinks, base::Unretained(this),
+ "dial"),
+ profile->GetRequestContext());
+ dial_media_sink_service_proxy_->Start();
+}
+
void MediaRouterMojoImpl::UpdateMediaSinks(
const MediaSource::Id& source_id) {
SetWakeReason(MediaRouteProviderWakeReason::UPDATE_MEDIA_SINKS);

Powered by Google App Engine
This is Rietveld 408576698