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

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

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/media/router/mojo/media_router_mojo_impl.h
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.h b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
index 0b38e048b02e65349f3d590e25db01c995132d50..4ee4caf4558c29d43ab398248b7ff40fe207cfc4 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
@@ -69,14 +69,14 @@
// enqueued for later use if the extension is temporarily suspended.
void CreateRoute(const MediaSource::Id& source_id,
const MediaSink::Id& sink_id,
- const url::Origin& origin,
+ const GURL& origin,
content::WebContents* web_contents,
const std::vector<MediaRouteResponseCallback>& callbacks,
base::TimeDelta timeout,
bool incognito) override;
void JoinRoute(const MediaSource::Id& source_id,
const std::string& presentation_id,
- const url::Origin& origin,
+ const GURL& origin,
content::WebContents* web_contents,
const std::vector<MediaRouteResponseCallback>& callbacks,
base::TimeDelta timeout,
@@ -84,7 +84,7 @@
void ConnectRouteByRouteId(
const MediaSource::Id& source,
const MediaRoute::Id& route_id,
- const url::Origin& origin,
+ const GURL& origin,
content::WebContents* web_contents,
const std::vector<MediaRouteResponseCallback>& callbacks,
base::TimeDelta timeout,
@@ -175,7 +175,7 @@
// Cached list of sinks for the query, if |has_cached_result| is true.
// Empty otherwise.
std::vector<MediaSink> cached_sink_list;
- std::vector<url::Origin> origins;
+ std::vector<GURL> origins;
base::ObserverList<MediaSinksObserver> observers;
private:
@@ -234,14 +234,14 @@
// These calls invoke methods in the component extension via Mojo.
void DoCreateRoute(const MediaSource::Id& source_id,
const MediaSink::Id& sink_id,
- const url::Origin& origin,
+ const std::string& origin,
int tab_id,
const std::vector<MediaRouteResponseCallback>& callbacks,
base::TimeDelta timeout,
bool incognito);
void DoJoinRoute(const MediaSource::Id& source_id,
const std::string& presentation_id,
- const url::Origin& origin,
+ const std::string& origin,
int tab_id,
const std::vector<MediaRouteResponseCallback>& callbacks,
base::TimeDelta timeout,
@@ -249,7 +249,7 @@
void DoConnectRouteByRouteId(
const MediaSource::Id& source_id,
const MediaRoute::Id& route_id,
- const url::Origin& origin,
+ const std::string& origin,
int tab_id,
const std::vector<MediaRouteResponseCallback>& callbacks,
base::TimeDelta timeout,
@@ -286,7 +286,7 @@
void OnIssue(const IssueInfo& issue) override;
void OnSinksReceived(const std::string& media_source,
std::vector<mojom::MediaSinkPtr> sinks,
- const std::vector<url::Origin>& origins) override;
+ const std::vector<std::string>& origins) override;
void OnRoutesUpdated(
std::vector<mojom::MediaRoutePtr> routes,
const std::string& media_source,
« no previous file with comments | « chrome/browser/media/router/mojo/media_router.mojom ('k') | chrome/browser/media/router/mojo/media_router_mojo_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698