chrome/browser/media/router/media_router_mojo_impl.cc - Issue 1202963004: Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/router/media_router_mojo_impl.cc

Issue 1202963004: Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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

« no previous file with comments | « chrome/browser/media/router/media_route_unittest.cc ('k') | chrome/browser/media/router/presentation_service_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/router/media_router_mojo_impl.cc

diff --git a/chrome/browser/media/router/media_router_mojo_impl.cc b/chrome/browser/media/router/media_router_mojo_impl.cc

index ffadab0eab3f31ee7b5e11bb9231578a5e37f6e0..b1b2e050e38d677d19caa3536ed9d7196952fb84 100644

--- a/chrome/browser/media/router/media_router_mojo_impl.cc

+++ b/chrome/browser/media/router/media_router_mojo_impl.cc

@@ -49,9 +49,9 @@ void EventPageWakeComplete(bool success) {

scoped_ptr<content::PresentationSessionMessage>

ConvertToPresentationSessionMessage(interfaces::RouteMessagePtr input) {

DCHECK(!input.is_null());

- // TODO(haibinlu): get presentation_url&id from route_id

- std::string presentation_url;

- std::string presentation_id;

+ const auto& id_and_url = GetPresentationIdAndUrl(input->route_id);

+ const std::string& presentation_id = id_and_url.first;

+ const std::string& presentation_url = id_and_url.second;

scoped_ptr<content::PresentationSessionMessage> output;

switch (input->type) {

case interfaces::RouteMessage::Type::TYPE_TEXT: {