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

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: Review Fixes 2 Created 5 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: 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 d0237e0a08d8da60c0d0e978ef6bbcdfef2354f4..a9ea48da57e51457e46a531871e58d47ddccc6c8 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
@@ -1,5 +1,6 @@
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html">
apacible 2015/12/09 19:56:25 What's the advantage of using iron-flex-layout rat
matt.boetger 2015/12/16 00:21:08 I had originally used flexbox, but after one of my
<dom-module id="route-details">
<link rel="import" type="css" href="../../media_router_common.css">
<link rel="import" type="css" href="route_details.css">
@@ -10,10 +11,19 @@
<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="flex-button-container">
+ <paper-button raised class="route-button button"
+ id="join-route-button"
+ hidden$="[[!route.canJoin]]"
+ on-click="joinRoute_">
+ <span>[[joinButtonText_]]</span>
+ </paper-button>
+ <paper-button raised class="route-button button"
+ id="close-route-button"
+ on-click="closeRoute_">
+ <span>[[stopCastingButtonText_]]</span>
+ </paper-button>
+ <div>
</template>
<script src="route_details.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698