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

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

Issue 2678123003: Revert of Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)
Patch Set: Created 3 years, 10 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 2bd508abbc4cecc9f6c20bbb1e8c6bc2494913cc..79fbb604293426c548c539b6324c5305852be752 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager.cc
+++ b/chrome/browser/ui/webui/media_router/query_result_manager.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/media/router/media_router.h"
#include "chrome/browser/media/router/media_sinks_observer.h"
#include "content/public/browser/browser_thread.h"
-#include "url/origin.h"
+#include "url/gurl.h"
namespace media_router {
@@ -23,7 +23,7 @@
public:
MediaSourceMediaSinksObserver(MediaCastMode cast_mode,
const MediaSource& source,
- const url::Origin& origin,
+ const GURL& origin,
MediaRouter* router,
QueryResultManager* result_manager)
: MediaSinksObserver(router, source, origin),
@@ -83,7 +83,7 @@
void QueryResultManager::SetSourcesForCastMode(
MediaCastMode cast_mode,
const std::vector<MediaSource>& sources,
- const url::Origin& origin) {
+ const GURL& origin) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (sources.empty()) {
LOG(WARNING) << "SetSourcesForCastMode called with empty sources for "
@@ -157,7 +157,7 @@
void QueryResultManager::AddObserversForCastMode(
MediaCastMode cast_mode,
const std::vector<MediaSource>& sources,
- const url::Origin& origin) {
+ const GURL& origin) {
for (const MediaSource& source : sources) {
if (!base::ContainsKey(sinks_observers_, source)) {
std::unique_ptr<MediaSourceMediaSinksObserver> observer(

Powered by Google App Engine
This is Rietveld 408576698