content/browser/presentation/presentation_type_converters.h - Issue 2174693004: [Presentation API] Add support to content/ for multiple URLs per PresentationRequest.

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: content/browser/presentation/presentation_type_converters.h

Issue 2174693004: [Presentation API] Add support to content/ for multiple URLs per PresentationRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update service, dispatcher to use Mojo URLs. Created 4 years, 4 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

« content/browser/presentation/presentation_service_impl.cc ('K') | « content/browser/presentation/presentation_service_impl_unittest.cc ('k') | content/browser/presentation/presentation_type_converters_unittest.cc » ('j') | content/renderer/presentation/presentation_dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/presentation/presentation_type_converters.h

diff --git a/content/browser/presentation/presentation_type_converters.h b/content/browser/presentation/presentation_type_converters.h

index 9285dfae09ebb676389ee65fdfc7c1fee6c132c6..6de5d26f181ea3c9cc55c1d3e8f1303a73c83af5 100644

--- a/content/browser/presentation/presentation_type_converters.h

+++ b/content/browser/presentation/presentation_type_converters.h

@@ -31,7 +31,9 @@ struct TypeConverter<blink::mojom::PresentationSessionInfoPtr,

const content::PresentationSessionInfo& input) {

blink::mojom::PresentationSessionInfoPtr output(

blink::mojom::PresentationSessionInfo::New());

- output->url = input.presentation_url;

+ url::mojom::UrlPtr url = url::mojom::Url::New();

+ url->url = input.presentation_url;

+ output->url = std::move(url);

output->id = input.presentation_id;

return output;

}

@@ -42,7 +44,7 @@ struct TypeConverter<content::PresentationSessionInfo,

blink::mojom::PresentationSessionInfoPtr> {

static content::PresentationSessionInfo Convert(

const blink::mojom::PresentationSessionInfoPtr& input) {

- return content::PresentationSessionInfo(input->url, input->id);

+ return content::PresentationSessionInfo(input->url->url, input->id);

}

};