Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h" | 5 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/guid.h" | 12 #include "base/guid.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
| 15 #include "base/memory/scoped_vector.h" | 15 #include "base/memory/scoped_vector.h" |
| 16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 #include "base/stl_util.h" | 17 #include "base/stl_util.h" |
| 18 #include "base/strings/stringprintf.h" | 18 #include "base/strings/stringprintf.h" |
| 19 #include "chrome/browser/media/router/issues_observer.h" | 19 #include "chrome/browser/media/router/issues_observer.h" |
| 20 #include "chrome/browser/media/router/media_router_factory.h" | 20 #include "chrome/browser/media/router/media_router_factory.h" |
| 21 #include "chrome/browser/media/router/media_routes_observer.h" | 21 #include "chrome/browser/media/router/media_routes_observer.h" |
| 22 #include "chrome/browser/media/router/media_sinks_observer.h" | 22 #include "chrome/browser/media/router/media_sinks_observer.h" |
| 23 #include "chrome/browser/media/router/media_source_helper.h" | |
| 23 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h" | 24 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h" |
| 24 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h" | 25 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h" |
| 25 #include "chrome/browser/media/router/mojo/media_router_type_converters.h" | 26 #include "chrome/browser/media/router/mojo/media_router_type_converters.h" |
| 26 #include "chrome/browser/media/router/presentation_session_messages_observer.h" | 27 #include "chrome/browser/media/router/presentation_session_messages_observer.h" |
| 27 #include "chrome/browser/sessions/session_tab_helper.h" | 28 #include "chrome/browser/sessions/session_tab_helper.h" |
| 28 #include "extensions/browser/process_manager.h" | 29 #include "extensions/browser/process_manager.h" |
| 29 | 30 |
| 30 #define DVLOG_WITH_INSTANCE(level) \ | 31 #define DVLOG_WITH_INSTANCE(level) \ |
| 31 DVLOG(level) << "MR #" << instance_id_ << ": " | 32 DVLOG(level) << "MR #" << instance_id_ << ": " |
| 32 | 33 |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 422 DCHECK(thread_checker_.CalledOnValidThread()); | 423 DCHECK(thread_checker_.CalledOnValidThread()); |
| 423 issue_manager_.AddIssue(issue); | 424 issue_manager_.AddIssue(issue); |
| 424 } | 425 } |
| 425 | 426 |
| 426 void MediaRouterMojoImpl::ClearIssue(const Issue::Id& issue_id) { | 427 void MediaRouterMojoImpl::ClearIssue(const Issue::Id& issue_id) { |
| 427 DCHECK(thread_checker_.CalledOnValidThread()); | 428 DCHECK(thread_checker_.CalledOnValidThread()); |
| 428 issue_manager_.ClearIssue(issue_id); | 429 issue_manager_.ClearIssue(issue_id); |
| 429 } | 430 } |
| 430 | 431 |
| 431 void MediaRouterMojoImpl::OnUserGesture() { | 432 void MediaRouterMojoImpl::OnUserGesture() { |
| 433 UpdateMediaSinks(MediaSourceForDesktop().id()); | |
|
imcheng
2016/04/15 18:37:02
could you add a comment here why this has to be do
amp
2016/04/15 20:29:33
Done. This was added per mfoltz comment on chrome
| |
| 434 | |
| 432 #if defined(OS_WIN) | 435 #if defined(OS_WIN) |
| 433 EnsureMdnsDiscoveryEnabled(); | 436 EnsureMdnsDiscoveryEnabled(); |
| 434 #endif | 437 #endif |
| 435 } | 438 } |
| 436 | 439 |
| 437 bool MediaRouterMojoImpl::RegisterMediaSinksObserver( | 440 bool MediaRouterMojoImpl::RegisterMediaSinksObserver( |
| 438 MediaSinksObserver* observer) { | 441 MediaSinksObserver* observer) { |
| 439 DCHECK(thread_checker_.CalledOnValidThread()); | 442 DCHECK(thread_checker_.CalledOnValidThread()); |
| 440 | 443 |
| 441 // Create an observer list for the media source and add |observer| | 444 // Create an observer list for the media source and add |observer| |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 981 } | 984 } |
| 982 } | 985 } |
| 983 | 986 |
| 984 void MediaRouterMojoImpl::OnFirewallCheckComplete( | 987 void MediaRouterMojoImpl::OnFirewallCheckComplete( |
| 985 bool firewall_can_use_local_ports) { | 988 bool firewall_can_use_local_ports) { |
| 986 if (firewall_can_use_local_ports) | 989 if (firewall_can_use_local_ports) |
| 987 EnsureMdnsDiscoveryEnabled(); | 990 EnsureMdnsDiscoveryEnabled(); |
| 988 } | 991 } |
| 989 #endif | 992 #endif |
| 990 | 993 |
| 994 void MediaRouterMojoImpl::UpdateMediaSinks( | |
| 995 const MediaSource::Id& source_id) { | |
| 996 SetWakeReason(MediaRouteProviderWakeReason::UPDATE_MEDIA_SINKS); | |
| 997 RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoUpdateMediaSinks, | |
| 998 base::Unretained(this), source_id)); | |
| 999 } | |
| 1000 | |
| 1001 void MediaRouterMojoImpl::DoUpdateMediaSinks( | |
| 1002 const MediaSource::Id& source_id) { | |
| 1003 DVLOG_WITH_INSTANCE(1) << "DoUpdateMediaSinks" << source_id; | |
| 1004 media_route_provider_->UpdateMediaSinks(source_id); | |
| 1005 } | |
| 1006 | |
| 991 } // namespace media_router | 1007 } // namespace media_router |
| OLD | NEW |