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

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

Issue 1821823002: [Media Router] Conditionally enable mDNS on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Semicolon for Windows code Created 4 years, 9 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/media_router_mojo_impl.cc
diff --git a/chrome/browser/media/router/media_router_mojo_impl.cc b/chrome/browser/media/router/media_router_mojo_impl.cc
index 54c50ee20c89b837ddffe385d4c6fe37d90b0fdd..b967129574f4fe22227cdf72aee8c84323a55378 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl.cc
@@ -15,6 +15,7 @@
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/media/router/issues_observer.h"
+#include "chrome/browser/media/router/media_route_provider_util_win.h"
#include "chrome/browser/media/router/media_router_factory.h"
#include "chrome/browser/media/router/media_router_metrics.h"
#include "chrome/browser/media/router/media_router_type_converters.h"
@@ -81,6 +82,11 @@ MediaRouterMojoImpl::MediaRouterMojoImpl(
current_wake_reason_(MediaRouteProviderWakeReason::TOTAL_COUNT),
weak_factory_(this) {
DCHECK(event_page_tracker_);
+#if defined(OS_WIN)
+ CanFirewallUseLocalPorts(
+ base::Bind(&MediaRouterMojoImpl::OnFirewallCheckComplete,
+ weak_factory_.GetWeakPtr()));
+#endif
}
MediaRouterMojoImpl::~MediaRouterMojoImpl() {
@@ -140,6 +146,14 @@ void MediaRouterMojoImpl::RegisterMediaRouteProvider(
callback) {
DCHECK(thread_checker_.CalledOnValidThread());
+#if defined(OS_WIN)
+ // The MRPM may have been upgraded or otherwise reload such that we could be
+ // seeing an MRPM that doesn't know mDNS is enabled, even if we've told a
+ // previously registered MRPM it should be enabled. Furthermore, there may be
+ // a pending request to enable mDNS, so don't clear this flag after
+ // ExecutePendingRequests().
+ is_mdns_enabled_ = false;
+#endif
if (event_page_tracker_->IsEventPageSuspended(
media_route_provider_extension_id_)) {
DVLOG_WITH_INSTANCE(1)
@@ -157,6 +171,16 @@ void MediaRouterMojoImpl::RegisterMediaRouteProvider(
callback.Run(instance_id_);
ExecutePendingRequests();
wakeup_attempt_count_ = 0;
+#if defined(OS_WIN)
+ // The MRPM extension already turns on mDNS discovery for platforms other than
+ // Windows. It only relies on this signalling from MR on Windows to avoid
+ // triggering a firewall prompt out of the context of MR from the user's
+ // perspective. This particular call reminds the extension to enable mDNS
+ // discovery when it wakes up, has been upgraded, etc.
+ if (should_enable_mdns_discovery_) {
+ DoEnsureMdnsDiscoveryEnabled();
+ }
+#endif
}
void MediaRouterMojoImpl::OnIssue(const interfaces::IssuePtr issue) {
@@ -402,6 +426,12 @@ void MediaRouterMojoImpl::ClearIssue(const Issue::Id& issue_id) {
issue_manager_.ClearIssue(issue_id);
}
+void MediaRouterMojoImpl::OnUserGesture() {
+#if defined(OS_WIN)
+ EnsureMdnsDiscoveryEnabled();
+#endif
+}
+
bool MediaRouterMojoImpl::RegisterMediaSinksObserver(
MediaSinksObserver* observer) {
DCHECK(thread_checker_.CalledOnValidThread());
@@ -930,4 +960,30 @@ void MediaRouterMojoImpl::ClearWakeReason() {
current_wake_reason_ = MediaRouteProviderWakeReason::TOTAL_COUNT;
}
+#if defined(OS_WIN)
+void MediaRouterMojoImpl::EnsureMdnsDiscoveryEnabled() {
+ if (is_mdns_enabled_)
+ return;
+
+ SetWakeReason(MediaRouteProviderWakeReason::ENABLE_MDNS_DISCOVERY);
+ RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoEnsureMdnsDiscoveryEnabled,
+ base::Unretained(this)));
+ should_enable_mdns_discovery_ = true;
+}
+
+void MediaRouterMojoImpl::DoEnsureMdnsDiscoveryEnabled() {
+ DVLOG_WITH_INSTANCE(1) << "DoEnsureMdnsDiscoveryEnabled";
+ if (!is_mdns_enabled_) {
+ media_route_provider_->EnableMdnsDiscovery();
+ is_mdns_enabled_ = true;
+ }
+}
+
+void MediaRouterMojoImpl::OnFirewallCheckComplete(
+ bool firewall_can_use_local_ports) {
+ if (firewall_can_use_local_ports)
+ EnsureMdnsDiscoveryEnabled();
+}
+#endif
+
} // namespace media_router
« no previous file with comments | « chrome/browser/media/router/media_router_mojo_impl.h ('k') | chrome/browser/media/router/media_router_mojo_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698