summaryrefslogtreecommitdiffstats
path: root/extensions/renderer
diff options
context:
space:
mode:
authormfoltz <mfoltz@chromium.org>2016-03-18 10:13:44 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-18 17:15:32 +0000
commitb4ba372948a5bc67e06377b5c2b57e539da0bf37 (patch)
tree50bb8d9508f84d68ec672647de1c17ba9cb4627d /extensions/renderer
parent2d38b38473ef8051f6e1f0ac46cb769f475ab18b (diff)
downloadchromium_src-b4ba372948a5bc67e06377b5c2b57e539da0bf37.zip
chromium_src-b4ba372948a5bc67e06377b5c2b57e539da0bf37.tar.gz
chromium_src-b4ba372948a5bc67e06377b5c2b57e539da0bf37.tar.bz2
Third patch to implement incognito support for Media Router.
This patch implements policies around incognito: - OTR media routes created from OTR profiles are tracked. When the OTR profile is destroyed, we attempt to terminate the OTR media routes. - Enforces that the OTR status of routes returned from to CreateRoute(), JoinRoute(), or ConnectRouteByRouteId() matches the OTR status of the profile that called them. Patches will be submitted in this order: 1682853007: Adds support for off the record media routes. This patch: Implements incognito policies for Media Router. 1702533003: Enables UI for incognito profiles. BUG=524795 Review URL: https://codereview.chromium.org/1745493003 Cr-Commit-Position: refs/heads/master@{#381996}
Diffstat (limited to 'extensions/renderer')
-rw-r--r--extensions/renderer/resources/media_router_bindings.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js
index cfb36f1..e7f32d8 100644
--- a/extensions/renderer/resources/media_router_bindings.js
+++ b/extensions/renderer/resources/media_router_bindings.js
@@ -624,15 +624,18 @@ define('media_router_bindings', [
* @param {!number} timeoutMillis If positive, the timeout duration for the
* request, measured in seconds. Otherwise, the default duration will be
* used.
+ * @param {!boolean} offTheRecord If true, the route is being requested by
+ * an off the record (incognito) profile.
* @return {!Promise.<!Object>} A Promise resolving to an object describing
* the newly created media route, or rejecting with an error message on
* failure.
*/
MediaRouteProvider.prototype.connectRouteByRouteId =
function(sourceUrn, routeId, presentationId, origin, tabId,
- timeoutMillis) {
+ timeoutMillis, offTheRecord) {
return this.handlers_.connectRouteByRouteId(
- sourceUrn, routeId, presentationId, origin, tabId, timeoutMillis)
+ sourceUrn, routeId, presentationId, origin, tabId, timeoutMillis,
+ offTheRecord)
.then(function(route) {
return toSuccessRouteResponse_(route);
},