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

Unified Diff: content/renderer/presentation/presentation_dispatcher.cc

Issue 2552343009: [Presentation API] Adds DOMString[] constructor to PresentationRequest. (Closed)
Patch Set: resolve code review comments from mlamouri 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/presentation/presentation_dispatcher.cc
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc
index 1d4062a0dd7ea2b93fbe27eba3d11d8951dc2d01..c4a36bd7acbb8122ee8a0499a48d7f0cea3b35a8 100644
--- a/content/renderer/presentation/presentation_dispatcher.cc
+++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -243,8 +243,10 @@ void PresentationDispatcher::terminateSession(
}
void PresentationDispatcher::getAvailability(
- const blink::WebURL& availabilityUrl,
+ const blink::WebVector<blink::WebURL>& availabilityUrls,
std::unique_ptr<blink::WebPresentationAvailabilityCallbacks> callbacks) {
+ // TODO(crbug.com/627655): Pass all URLs to PresentationService.
mlamouri (slow - plz ping) 2016/12/13 13:50:53 nit: usually, we do TODO(username) and mention the
zhaobin 2016/12/14 01:51:53 Done.
+ const blink::WebURL& availabilityUrl = availabilityUrls[0];
AvailabilityStatus* status = nullptr;
auto status_it = availability_status_.find(availabilityUrl);
if (status_it == availability_status_.end()) {
@@ -269,10 +271,12 @@ void PresentationDispatcher::getAvailability(
void PresentationDispatcher::startListening(
blink::WebPresentationAvailabilityObserver* observer) {
- auto status_it = availability_status_.find(observer->url());
+ // TODO(mfoltz): Pass all URLs to PresentationService.
+ const blink::WebURL& availabilityUrl = observer->urls()[0];
+ auto status_it = availability_status_.find(availabilityUrl);
if (status_it == availability_status_.end()) {
DLOG(WARNING) << "Start listening for availability for unknown URL "
- << GURL(observer->url());
+ << GURL(availabilityUrl);
return;
}
status_it->second->availability_observers.insert(observer);
@@ -281,10 +285,12 @@ void PresentationDispatcher::startListening(
void PresentationDispatcher::stopListening(
blink::WebPresentationAvailabilityObserver* observer) {
- auto status_it = availability_status_.find(observer->url());
+ // TODO(mfoltz): Pass all URLs to PresentationService.
+ const blink::WebURL& availabilityUrl = observer->urls()[0];
+ auto status_it = availability_status_.find(availabilityUrl);
if (status_it == availability_status_.end()) {
DLOG(WARNING) << "Stop listening for availability for unknown URL "
- << GURL(observer->url());
+ << GURL(availabilityUrl);
return;
}
status_it->second->availability_observers.erase(observer);

Powered by Google App Engine
This is Rietveld 408576698