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

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

Issue 2264153002: [Presentation API] Add support for multiple URLs in PresentationRequest on Media Router UI side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Mark's comments Created 4 years, 3 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/presentation_request.h" 5 #include "chrome/browser/media/router/presentation_request.h"
6 6
7 #include "chrome/browser/media/router/media_source_helper.h" 7 #include "chrome/browser/media/router/media_source_helper.h"
8 8
9 namespace media_router { 9 namespace media_router {
10 10
11 PresentationRequest::PresentationRequest( 11 PresentationRequest::PresentationRequest(
12 const RenderFrameHostId& render_frame_host_id, 12 const RenderFrameHostId& render_frame_host_id,
13 const std::string& presentation_url, 13 const std::vector<std::string>& presentation_urls,
14 const GURL& frame_url) 14 const GURL& frame_url)
15 : render_frame_host_id_(render_frame_host_id), 15 : render_frame_host_id_(render_frame_host_id),
16 presentation_url_(presentation_url), 16 presentation_urls_(presentation_urls),
17 frame_url_(frame_url) {} 17 frame_url_(frame_url) {
18 DCHECK(!presentation_urls_.empty());
19 }
18 20
19 PresentationRequest::PresentationRequest(const PresentationRequest& other) = 21 PresentationRequest::PresentationRequest(const PresentationRequest& other) =
20 default; 22 default;
21 23
22 PresentationRequest::~PresentationRequest() = default; 24 PresentationRequest::~PresentationRequest() = default;
23 25
24 bool PresentationRequest::Equals(const PresentationRequest& other) const { 26 bool PresentationRequest::Equals(const PresentationRequest& other) const {
25 return render_frame_host_id_ == other.render_frame_host_id_ && 27 return render_frame_host_id_ == other.render_frame_host_id_ &&
26 presentation_url_ == other.presentation_url_ && 28 presentation_urls_ == other.presentation_urls_ &&
27 frame_url_ == other.frame_url_; 29 frame_url_ == other.frame_url_;
28 } 30 }
29 31
30 MediaSource PresentationRequest::GetMediaSource() const { 32 std::vector<MediaSource> PresentationRequest::GetMediaSources() const {
31 return MediaSourceForPresentationUrl(presentation_url_); 33 std::vector<MediaSource> sources;
34 for (const std::string& presentation_url : presentation_urls_)
mark a. foltz 2016/09/09 22:22:26 nit: const auto&
takumif 2016/09/13 03:48:21 Done.
35 sources.push_back(MediaSourceForPresentationUrl(presentation_url));
36 return sources;
32 } 37 }
33 38
34 } // namespace media_router 39 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698