| OLD | NEW | 
|---|
| 1 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 1 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2      Use of this source code is governed by a BSD-style license that can be | 2      Use of this source code is governed by a BSD-style license that can be | 
| 3      found in the LICENSE file. --> | 3      found in the LICENSE file. --> | 
| 4 | 4 | 
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
     s/iron-flex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
     s/iron-flex-layout.html"> | 
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
     l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
     l"> | 
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i
     conset-svg.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i
     conset-svg.html"> | 
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele
     ctor.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele
     ctor.html"> | 
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animatio
     ns/fade-in-animation.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animatio
     ns/fade-in-animation.html"> | 
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animatio
     ns/fade-out-animation.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animatio
     ns/fade-out-animation.html"> | 
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animatio
     ns/hero-animation.html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animatio
     ns/hero-animation.html"> | 
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
     matable-behavior.html"> | 12 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
     matable-behavior.html"> | 
| 13 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
     mated-pages.html"> | 13 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
     mated-pages.html"> | 
| 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
     on.html"> | 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
     on.html"> | 
| 15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-icon-i
     tem.html"> | 15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-icon-i
     tem.html"> | 
| 16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-ma
     terial.html"> |  | 
| 17 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-pr
     ogress.html"> | 16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-pr
     ogress.html"> | 
| 18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html
     "> | 17 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html
     "> | 
|  | 18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm
     l"> | 
| 19 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 19 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 
| 20 | 20 | 
| 21 <!-- | 21 <!-- | 
| 22 List of devices. | 22 List of devices. | 
| 23 Published properties: | 23 Published properties: | 
| 24   * devices - array of strings, the model of the list. | 24   * devices - array of strings, the model of the list. | 
| 25   * selected - a name of the selected device ('null' if no devices are | 25   * selected - a name of the selected device ('null' if no devices are | 
| 26     selected). | 26     selected). | 
| 27   * connecting - a binary attribute. If set, the list does not respond to the | 27   * connecting - a binary attribute. If set, the list does not respond to the | 
| 28     user actions and a spinner is shown near selected device. | 28     user actions and a spinner is shown near selected device. | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 100         </div> | 100         </div> | 
| 101       </div> | 101       </div> | 
| 102     </div> | 102     </div> | 
| 103   </template> | 103   </template> | 
| 104 </dom-module> | 104 </dom-module> | 
| 105 | 105 | 
| 106 <dom-module id="controller-pairing-screen"> | 106 <dom-module id="controller-pairing-screen"> | 
| 107   <link rel="stylesheet" href="oobe_screen_controller_pairing.css"> | 107   <link rel="stylesheet" href="oobe_screen_controller_pairing.css"> | 
| 108 | 108 | 
| 109   <template> | 109   <template> | 
| 110     <paper-material class="fit"> | 110     <style> | 
|  | 111       div.elevate { | 
|  | 112         @apply(--shadow-elevation-2dp); | 
|  | 113       } | 
|  | 114     </style> | 
|  | 115     <div class="fit elevate"> | 
| 111       <neon-animated-pages id="pages" selected="{{C.page}}" | 116       <neon-animated-pages id="pages" selected="{{C.page}}" | 
| 112           attr-for-selected="name" class="fit"> | 117           attr-for-selected="name" class="fit"> | 
| 113         <controller-pairing-page name="devices-discovery" class="big-font"> | 118         <controller-pairing-page name="devices-discovery" class="big-font"> | 
| 114           <div class="title" | 119           <div class="title" | 
| 115               i18n-content="loginControllerPairingScreenWelcomeTitle"> | 120               i18n-content="loginControllerPairingScreenWelcomeTitle"> | 
| 116           </div> | 121           </div> | 
| 117           <div i18n-content="loginControllerPairingScreenSearching"></div> | 122           <div i18n-content="loginControllerPairingScreenSearching"></div> | 
| 118           <paper-button class="help-button" on-tap="helpButtonClicked_" | 123           <paper-button class="help-button" on-tap="helpButtonClicked_" | 
| 119               i18n-content="loginControllerPairingScreenHelpBtn"> | 124               i18n-content="loginControllerPairingScreenHelpBtn"> | 
| 120           </paper-button> | 125           </paper-button> | 
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 255           <div class="title" | 260           <div class="title" | 
| 256               i18n-content="loginControllerPairingScreenSuccessTitle"> | 261               i18n-content="loginControllerPairingScreenSuccessTitle"> | 
| 257           </div> | 262           </div> | 
| 258           <div><span>[[getSuccessMessage_(selectedDevice)]]</div> | 263           <div><span>[[getSuccessMessage_(selectedDevice)]]</div> | 
| 259           <paper-button on-tap="userActed" action="startSession" | 264           <paper-button on-tap="userActed" action="startSession" | 
| 260               disabled$="{{C.controlsDisabled}}" | 265               disabled$="{{C.controlsDisabled}}" | 
| 261               i18n-content="loginControllerPairingScreenContinueToHangoutsBtn"> | 266               i18n-content="loginControllerPairingScreenContinueToHangoutsBtn"> | 
| 262           </paper-button> | 267           </paper-button> | 
| 263         </controller-pairing-page> | 268         </controller-pairing-page> | 
| 264       </neon-animated-pages> | 269       </neon-animated-pages> | 
| 265     </paper-material> | 270     </div> | 
| 266   </template> | 271   </template> | 
| 267 </dom-module> | 272 </dom-module> | 
| OLD | NEW | 
|---|