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

Side by Side Diff: chrome/browser/media/router/media_source_helper.cc

Issue 1693963003: Pass origin to StartObservingMediaSinks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Marks Review Fixes with URL changes 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 unified diff | Download patch
OLDNEW
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/media_source_helper.h" 5 #include "chrome/browser/media/router/media_source_helper.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chrome/browser/media/router/media_source.h" 9 #include "chrome/browser/media/router/media_source.h"
10 #include "chrome/common/url_constants.h"
10 #include "url/gurl.h" 11 #include "url/gurl.h"
11 12
12 namespace media_router { 13 namespace media_router {
13 14
14 // Prefixes used to format and detect various protocols' media source URNs. 15 // Prefixes used to format and detect various protocols' media source URNs.
15 // See: https://www.ietf.org/rfc/rfc3406.txt 16 // See: https://www.ietf.org/rfc/rfc3406.txt
16 const char kTabMediaUrnPrefix[] = "urn:x-org.chromium.media:source:tab"; 17 const char kTabMediaUrnPrefix[] = "urn:x-org.chromium.media:source:tab";
17 const char kDesktopMediaUrn[] = "urn:x-org.chromium.media:source:desktop"; 18 const char kDesktopMediaUrn[] = "urn:x-org.chromium.media:source:desktop";
18 const char kCastUrnPrefix[] = "urn:x-com.google.cast:application:"; 19 const char kCastUrnPrefix[] = "urn:x-com.google.cast:application:";
19 20
20 MediaSource MediaSourceForTab(int tab_id) { 21 MediaSource MediaSourceForTab(int tab_id) {
21 return MediaSource(base::StringPrintf("%s:%d", kTabMediaUrnPrefix, tab_id)); 22 return MediaSource(base::StringPrintf("%s:%d", kTabMediaUrnPrefix, tab_id));
22 } 23 }
23 24
24 MediaSource MediaSourceForDesktop() { 25 MediaSource MediaSourceForDesktop() {
25 return MediaSource(std::string(kDesktopMediaUrn)); 26 MediaSource source(kDesktopMediaUrn);
27 source.set_origin(chrome::kChromeUIMediaRouterURL);
28 return source;
29 }
30
31 GURL OriginForDesktop() {
32 return GURL(std::string(chrome::kChromeUIMediaRouterURL));
26 } 33 }
27 34
28 MediaSource MediaSourceForCastApp(const std::string& app_id) { 35 MediaSource MediaSourceForCastApp(const std::string& app_id) {
29 return MediaSource(kCastUrnPrefix + app_id); 36 return MediaSource(kCastUrnPrefix + app_id);
30 } 37 }
31 38
32 MediaSource MediaSourceForPresentationUrl(const std::string& presentation_url) { 39 MediaSource MediaSourceForPresentationUrl(const std::string& presentation_url,
33 return MediaSource(presentation_url); 40 const std::string& origin) {
41 MediaSource source(presentation_url);
42 source.set_origin(origin);
43 return source;
34 } 44 }
35 45
36 bool IsDesktopMirroringMediaSource(const MediaSource& source) { 46 bool IsDesktopMirroringMediaSource(const MediaSource& source) {
37 return base::StartsWith(source.id(), kDesktopMediaUrn, 47 return base::StartsWith(source.id(), kDesktopMediaUrn,
38 base::CompareCase::SENSITIVE); 48 base::CompareCase::SENSITIVE);
39 } 49 }
40 50
41 bool IsTabMirroringMediaSource(const MediaSource& source) { 51 bool IsTabMirroringMediaSource(const MediaSource& source) {
42 return base::StartsWith(source.id(), kTabMediaUrnPrefix, 52 return base::StartsWith(source.id(), kTabMediaUrnPrefix,
43 base::CompareCase::SENSITIVE); 53 base::CompareCase::SENSITIVE);
(...skipping 17 matching lines...) Expand all
61 std::string PresentationUrlFromMediaSource(const MediaSource& source) { 71 std::string PresentationUrlFromMediaSource(const MediaSource& source) {
62 return IsValidPresentationUrl(source.id()) ? source.id() : ""; 72 return IsValidPresentationUrl(source.id()) ? source.id() : "";
63 } 73 }
64 74
65 bool IsValidPresentationUrl(const std::string& url) { 75 bool IsValidPresentationUrl(const std::string& url) {
66 GURL gurl(url); 76 GURL gurl(url);
67 return gurl.is_valid() && gurl.SchemeIsHTTPOrHTTPS(); 77 return gurl.is_valid() && gurl.SchemeIsHTTPOrHTTPS();
68 } 78 }
69 79
70 } // namespace media_router 80 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/media_source_helper.h ('k') | chrome/browser/media/router/media_source_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698