Chromium Code Reviews| Index: third_party/WebKit/Source/modules/presentation/PresentationController.cpp |
| diff --git a/third_party/WebKit/Source/modules/presentation/PresentationController.cpp b/third_party/WebKit/Source/modules/presentation/PresentationController.cpp |
| index 5d16703f9543243602adf6dfd325ca0e7c813179..a743b0fae75a5f8feb59ce8a344d8d6941e8817c 100644 |
| --- a/third_party/WebKit/Source/modules/presentation/PresentationController.cpp |
| +++ b/third_party/WebKit/Source/modules/presentation/PresentationController.cpp |
| @@ -6,6 +6,8 @@ |
| #include "core/frame/LocalFrame.h" |
| #include "modules/presentation/PresentationConnection.h" |
| +#include "public/platform/WebString.h" |
| +#include "public/platform/WebVector.h" |
| #include "public/platform/modules/presentation/WebPresentationClient.h" |
| #include "wtf/PtrUtil.h" |
| #include <memory> |
| @@ -123,14 +125,16 @@ void PresentationController::setPresentation(Presentation* presentation) { |
| m_presentation = presentation; |
| } |
| -void PresentationController::setDefaultRequestUrl(const KURL& url) { |
| +void PresentationController::setDefaultRequestUrl( |
| + const WTF::Vector<KURL>& urls) { |
| if (!m_client) |
| return; |
| - // TODO(crbug.com/627655): Accept multiple URLs per PresentationRequest. |
| - WebVector<WebURL> presentationUrls(static_cast<size_t>(1)); |
| - if (url.isValid()) |
| - presentationUrls[0] = url; |
| + WebVector<WebURL> presentationUrls(urls.size()); |
| + for (size_t i = 0; i < urls.size(); ++i) { |
| + if (urls[i].isValid()) |
|
mark a. foltz
2016/12/09 05:38:03
We should be throwing a SyntaxException in the cto
zhaobin
2016/12/09 23:01:59
We have checked urls in PresentationRequest ctor,
|
| + presentationUrls[i] = urls[i]; |
| + } |
| m_client->setDefaultPresentationUrls(presentationUrls); |
| } |