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

Unified Diff: chrome/browser/ui/webui/media_router/query_result_manager.cc

Issue 1784533004: [Media Router] Add origins to sink query results. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test 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/ui/webui/media_router/query_result_manager.cc
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.cc b/chrome/browser/ui/webui/media_router/query_result_manager.cc
index e451fdb3e4971b53f3d2d077d768c3c28eb8a1c4..2baa55c0d63f21b8c342c81ea41ed93155504b77 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager.cc
+++ b/chrome/browser/ui/webui/media_router/query_result_manager.cc
@@ -18,9 +18,10 @@ class QueryResultManager::CastModeMediaSinksObserver
public:
CastModeMediaSinksObserver(MediaCastMode cast_mode,
const MediaSource& source,
+ const GURL& origin,
MediaRouter* router,
QueryResultManager* result_manager)
- : MediaSinksObserver(router, source),
+ : MediaSinksObserver(router, source, origin),
cast_mode_(cast_mode),
result_manager_(result_manager) {
DCHECK(result_manager);
@@ -73,7 +74,8 @@ void QueryResultManager::RemoveObserver(Observer* observer) {
}
void QueryResultManager::StartSinksQuery(MediaCastMode cast_mode,
- const MediaSource& source) {
+ const MediaSource& source,
+ const GURL& origin) {
DCHECK(thread_checker_.CalledOnValidThread());
if (source.Empty()) {
LOG(WARNING) << "StartSinksQuery called with empty source for "
@@ -86,7 +88,7 @@ void QueryResultManager::StartSinksQuery(MediaCastMode cast_mode,
UpdateWithSinksQueryResult(cast_mode, std::vector<MediaSink>());
scoped_ptr<CastModeMediaSinksObserver> observer(
- new CastModeMediaSinksObserver(cast_mode, source, router_, this));
+ new CastModeMediaSinksObserver(cast_mode, source, origin, router_, this));
observer->Init();
auto result =
sinks_observers_.insert(std::make_pair(cast_mode, std::move(observer)));

Powered by Google App Engine
This is Rietveld 408576698