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

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 foolip Created 3 years, 11 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
Index: content/renderer/presentation/presentation_dispatcher.cc
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc
index 2e084eea62e1a9e5802c4d1517df9dac974182e4..29e0f0229ffd9ad023675ce58cdd24e3926d2cd4 100644
--- a/content/renderer/presentation/presentation_dispatcher.cc
+++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -261,8 +261,10 @@ void PresentationDispatcher::terminateSession(
}
void PresentationDispatcher::getAvailability(
- const blink::WebURL& availabilityUrl,
+ const blink::WebVector<blink::WebURL>& availabilityUrls,
std::unique_ptr<blink::WebPresentationAvailabilityCallbacks> callbacks) {
+ // TODO(mfoltz): Pass all URLs to PresentationService. See crbug.com/627655.
+ const blink::WebURL& availabilityUrl = availabilityUrls[0];
AvailabilityStatus* status = nullptr;
auto status_it = availability_status_.find(availabilityUrl);
if (status_it == availability_status_.end()) {
@@ -287,10 +289,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. See crbug.com/627655.
+ 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);
@@ -299,10 +303,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. See crbug.com/627655.
+ 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