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

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

Issue 2547703002: [Media Router] Handle multiple Presentation URLs when creating routes (Closed)
Patch Set: resolve code review comments from Mark Created 4 years 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 <stdio.h> 7 #include <stdio.h>
8 8
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "chrome/browser/media/router/media_source.h" 11 #include "chrome/browser/media/router/media_source.h"
12 #include "chrome/browser/sessions/session_tab_helper.h" 12 #include "chrome/browser/sessions/session_tab_helper.h"
13 #include "url/gurl.h" 13 #include "url/gurl.h"
14 14
15 namespace media_router { 15 namespace media_router {
16 16
17 namespace { 17 namespace {
18 18
19 // Prefixes used to format and detect various protocols' media source URNs. 19 // Prefixes used to format and detect various protocols' media source URNs.
20 // See: https://www.ietf.org/rfc/rfc3406.txt 20 // See: https://www.ietf.org/rfc/rfc3406.txt
21 constexpr char kTabMediaUrnFormat[] = "urn:x-org.chromium.media:source:tab:%d"; 21 constexpr char kTabMediaUrnFormat[] = "urn:x-org.chromium.media:source:tab:%d";
22 constexpr char kDesktopMediaUrn[] = "urn:x-org.chromium.media:source:desktop"; 22 constexpr char kDesktopMediaUrn[] = "urn:x-org.chromium.media:source:desktop";
23 constexpr char kTabRemotingUrnFormat[] = 23 constexpr char kTabRemotingUrnFormat[] =
24 "urn:x-org.chromium.media:source:tab_content_remoting:%d"; 24 "urn:x-org.chromium.media:source:tab_content_remoting:%d";
25 constexpr char kCastPresentationUrlPrefix[] =
26 "https://google.com/cast#__castAppId__=";
25 27
26 } // namespace 28 } // namespace
27 29
28 MediaSource MediaSourceForTab(int tab_id) { 30 MediaSource MediaSourceForTab(int tab_id) {
29 return MediaSource(base::StringPrintf(kTabMediaUrnFormat, tab_id)); 31 return MediaSource(base::StringPrintf(kTabMediaUrnFormat, tab_id));
30 } 32 }
31 33
32 MediaSource MediaSourceForTabContentRemoting(content::WebContents* contents) { 34 MediaSource MediaSourceForTabContentRemoting(content::WebContents* contents) {
33 DCHECK(contents); 35 DCHECK(contents);
34 return MediaSource(base::StringPrintf(kTabRemotingUrnFormat, 36 return MediaSource(base::StringPrintf(kTabRemotingUrnFormat,
(...skipping 17 matching lines...) Expand all
52 int tab_id; 54 int tab_id;
53 return sscanf(source.id().c_str(), kTabMediaUrnFormat, &tab_id) == 1 && 55 return sscanf(source.id().c_str(), kTabMediaUrnFormat, &tab_id) == 1 &&
54 tab_id > 0; 56 tab_id > 0;
55 } 57 }
56 58
57 bool IsMirroringMediaSource(const MediaSource& source) { 59 bool IsMirroringMediaSource(const MediaSource& source) {
58 return IsDesktopMirroringMediaSource(source) || 60 return IsDesktopMirroringMediaSource(source) ||
59 IsTabMirroringMediaSource(source); 61 IsTabMirroringMediaSource(source);
60 } 62 }
61 63
64 bool CanConnectToMediaSource(const MediaSource& source) {
65 return base::StartsWith(source.id(), kCastPresentationUrlPrefix,
mark a. foltz 2016/12/05 22:21:13 Can you compare host, port, scheme, and path prefi
zhaobin 2016/12/06 20:06:36 Done.
66 base::CompareCase::INSENSITIVE_ASCII);
67 }
68
62 int TabIdFromMediaSource(const MediaSource& source) { 69 int TabIdFromMediaSource(const MediaSource& source) {
63 int tab_id; 70 int tab_id;
64 if (sscanf(source.id().c_str(), kTabMediaUrnFormat, &tab_id) == 1) 71 if (sscanf(source.id().c_str(), kTabMediaUrnFormat, &tab_id) == 1)
65 return tab_id; 72 return tab_id;
66 else if (sscanf(source.id().c_str(), kTabRemotingUrnFormat, &tab_id) == 1) 73 else if (sscanf(source.id().c_str(), kTabRemotingUrnFormat, &tab_id) == 1)
67 return tab_id; 74 return tab_id;
68 else 75 else
69 return -1; 76 return -1;
70 } 77 }
71 78
72 bool IsValidMediaSource(const MediaSource& source) { 79 bool IsValidMediaSource(const MediaSource& source) {
73 return TabIdFromMediaSource(source) > 0 || 80 return TabIdFromMediaSource(source) > 0 ||
74 IsDesktopMirroringMediaSource(source) || 81 IsDesktopMirroringMediaSource(source) ||
75 IsValidPresentationUrl(GURL(source.id())); 82 IsValidPresentationUrl(GURL(source.id()));
76 } 83 }
77 84
78 bool IsValidPresentationUrl(const GURL& url) { 85 bool IsValidPresentationUrl(const GURL& url) {
79 return url.is_valid() && url.SchemeIsHTTPOrHTTPS(); 86 return url.is_valid() && url.SchemeIsHTTPOrHTTPS();
80 } 87 }
81 88
82 } // namespace media_router 89 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698