chrome/browser/resources/media_router/elements/route_details/route_details.html - Issue 1415103006: Non-Local Join for Media Router and Presentation API

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: chrome/browser/resources/media_router/elements/route_details/route_details.html

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added Unit Tests Created 5 years, 1 month 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

« chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js ('K') | « chrome/browser/resources/media_router/elements/route_details/route_details.css ('k') | chrome/browser/resources/media_router/elements/route_details/route_details.js » ('j') | chrome/browser/resources/media_router/elements/route_details/route_details.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/media_router/elements/route_details/route_details.html

diff --git a/chrome/browser/resources/media_router/elements/route_details/route_details.html b/chrome/browser/resources/media_router/elements/route_details/route_details.html

index 33ab8e62524b00f67ab3d15e66038dfdfd61a18c..d71c3261bd5ce42d55d2ab3c8c63b915ddda1d48 100644

--- a/chrome/browser/resources/media_router/elements/route_details/route_details.html

+++ b/chrome/browser/resources/media_router/elements/route_details/route_details.html

@@ -14,10 +14,17 @@

<extensionview id="custom-controller"

hidden$="[[isCustomControllerHidden_]]">

</extensionview>

- <paper-button raised id="close-route-button" class="button"

- on-click="closeRoute_">

- <span>[[stopCastingButtonText_]]</span>

- </paper-button>

+ <div class="layout horizontal end-justified">

+ <paper-button raised class="flex self-stretch route-button button"

+ hidden$="[[!route.canJoin]]"

imcheng 2015/11/19 18:55:08 Maybe more of a UX question: do we want to show th

matt.boetger 2015/11/24 19:45:23 In the code, the assumption is made that only the

+ on-click="joinRoute_">

+ <span>[[joinCastingButtonText_]]</span>

+ </paper-button>

+ <paper-button raised class="flex self-stretch route-button button"

+ on-click="closeRoute_">

+ <span>[[stopCastingButtonText_]]</span>

+ </paper-button>

+ <div>

</template>

</dom-module>