| 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"> | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 105 | 105 | 
| 106 <dom-module name="controller-pairing-screen"> | 106 <dom-module name="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     <paper-material class="fit"> | 
| 111       <neon-animated-pages id="pages" selected="{{C.page}}" | 111       <neon-animated-pages id="pages" selected="{{C.page}}" | 
| 112           attr-for-selected="name" class="fit"> | 112           attr-for-selected="name" class="fit"> | 
| 113         <controller-pairing-page name="devices-discovery" class="big-font"> | 113         <controller-pairing-page name="devices-discovery" class="big-font"> | 
| 114           <div class="title" | 114           <div class="title" | 
| 115               i18n-content="login_ControllerPairingScreen_welcomeTitle"> | 115               i18n-content="loginControllerPairingScreenWelcomeTitle"> | 
| 116           </div> | 116           </div> | 
| 117           <div i18n-content="login_ControllerPairingScreen_searching"></div> | 117           <div i18n-content="loginControllerPairingScreenSearching"></div> | 
| 118           <paper-button class="help-button" on-tap="helpButtonClicked_" | 118           <paper-button class="help-button" on-tap="helpButtonClicked_" | 
| 119               i18n-content="login_ControllerPairingScreen_helpBtn"> | 119               i18n-content="loginControllerPairingScreenHelpBtn"> | 
| 120           </paper-button> | 120           </paper-button> | 
| 121         </controller-pairing-page> | 121         </controller-pairing-page> | 
| 122 | 122 | 
| 123         <controller-pairing-page name="device-select" class="split"> | 123         <controller-pairing-page name="device-select" class="split"> | 
| 124           <div class="title" | 124           <div class="title" | 
| 125               i18n-content="login_ControllerPairingScreen_selectTitle"> | 125               i18n-content="loginControllerPairingScreenSelectTitle"> | 
| 126           </div> | 126           </div> | 
| 127           <pairing-device-list devices="[[C.devices]]" | 127           <pairing-device-list devices="[[C.devices]]" | 
| 128               selected="{{selectedDevice}}"> | 128               selected="{{selectedDevice}}"> | 
| 129           </pairing-device-list> | 129           </pairing-device-list> | 
| 130           <paper-button class="help-button" on-tap="helpButtonClicked_" | 130           <paper-button class="help-button" on-tap="helpButtonClicked_" | 
| 131               i18n-content="login_ControllerPairingScreen_helpBtn"> | 131               i18n-content="loginControllerPairingScreenHelpBtn"> | 
| 132           </paper-button> | 132           </paper-button> | 
| 133           <paper-button on-tap="userActed" action="chooseDevice" | 133           <paper-button on-tap="userActed" action="chooseDevice" | 
| 134               disabled$="[[C.controlsDisabled]]" | 134               disabled$="[[C.controlsDisabled]]" | 
| 135               i18n-content="login_ControllerPairingScreen_connectBtn"> | 135               i18n-content="loginControllerPairingScreenConnectBtn"> | 
| 136           </paper-button> | 136           </paper-button> | 
| 137         </controller-pairing-page> | 137         </controller-pairing-page> | 
| 138 | 138 | 
| 139         <controller-pairing-page name="device-not-found"> | 139         <controller-pairing-page name="device-not-found"> | 
| 140           <div class="title" | 140           <div class="title" | 
| 141               i18n-content="login_ControllerPairingScreen_troubleConnectingTitle
     "> | 141               i18n-content="loginControllerPairingScreenTroubleConnectingTitle"> | 
| 142           </div> | 142           </div> | 
| 143           <div i18n-content="login_ControllerPairingScreen_connectingAdvice"> | 143           <div i18n-content="loginControllerPairingScreenConnectingAdvice"> | 
| 144           </div> | 144           </div> | 
| 145           <paper-button on-tap="userActed" action="repeatDiscovery" | 145           <paper-button on-tap="userActed" action="repeatDiscovery" | 
| 146               i18n-content="login_ControllerPairingScreen_adviceGotItBtn"> | 146               i18n-content="loginControllerPairingScreenAdviceGotItBtn"> | 
| 147           </paper-button> | 147           </paper-button> | 
| 148         </controller-pairing-page> | 148         </controller-pairing-page> | 
| 149 | 149 | 
| 150         <controller-pairing-page name="establishing-connection" class="split"> | 150         <controller-pairing-page name="establishing-connection" class="split"> | 
| 151           <div class="title" | 151           <div class="title" | 
| 152               i18n-content="login_ControllerPairingScreen_selectTitle"> | 152               i18n-content="loginControllerPairingScreenSelectTitle"> | 
| 153           </div> | 153           </div> | 
| 154           <pairing-device-list devices="[[C.devices]]" | 154           <pairing-device-list devices="[[C.devices]]" | 
| 155               selected="{{selectedDevice}}" connecting> | 155               selected="{{selectedDevice}}" connecting> | 
| 156           </pairing-device-list> | 156           </pairing-device-list> | 
| 157           <paper-button class="help-button" on-tap="helpButtonClicked_" | 157           <paper-button class="help-button" on-tap="helpButtonClicked_" | 
| 158               i18n-content="login_ControllerPairingScreen_helpBtn"> | 158               i18n-content="loginControllerPairingScreenHelpBtn"> | 
| 159           </paper-button> | 159           </paper-button> | 
| 160           <paper-button disabled | 160           <paper-button disabled | 
| 161               i18n-content="login_ControllerPairingScreen_connecting"> | 161               i18n-content="loginControllerPairingScreenConnecting"> | 
| 162           </paper-button> | 162           </paper-button> | 
| 163         </controller-pairing-page> | 163         </controller-pairing-page> | 
| 164 | 164 | 
| 165         <controller-pairing-page name="establishing-connection-error"> | 165         <controller-pairing-page name="establishing-connection-error"> | 
| 166           <!-- TODO(dzhioev): Strings TBD. http://crbug.com/423740 --> | 166           <!-- TODO(dzhioev): Strings TBD. http://crbug.com/423740 --> | 
| 167           <div class="title"> | 167           <div class="title"> | 
| 168             Unable to connect to <span>[[selectedDevice]]<span> | 168             Unable to connect to <span>[[selectedDevice]]<span> | 
| 169           </div> | 169           </div> | 
| 170           <paper-button on-tap="userActed" action="repeatDiscovery"> | 170           <paper-button on-tap="userActed" action="repeatDiscovery"> | 
| 171             Repeat discovery | 171             Repeat discovery | 
| 172           </paper-button> | 172           </paper-button> | 
| 173         </controller-pairing-page> | 173         </controller-pairing-page> | 
| 174 | 174 | 
| 175         <controller-pairing-page name="code-confirmation" class="split"> | 175         <controller-pairing-page name="code-confirmation" class="split"> | 
| 176           <div class="title" | 176           <div class="title" | 
| 177               i18n-content="login_ControllerPairingScreen_confirmationTitle"> | 177               i18n-content="loginControllerPairingScreenConfirmationTitle"> | 
| 178           </div> | 178           </div> | 
| 179           <div | 179           <div | 
| 180               i18n-content="login_ControllerPairingScreen_confirmationQuestion"> | 180               i18n-content="loginControllerPairingScreenConfirmationQuestion"> | 
| 181           </div> | 181           </div> | 
| 182           <div id="code"><span>[[C.code]]</span></div> | 182           <div id="code"><span>[[C.code]]</span></div> | 
| 183           <paper-button on-tap="userActed" action="rejectCode" | 183           <paper-button on-tap="userActed" action="rejectCode" | 
| 184               disabled$="[[C.controlsDisabled]" | 184               disabled$="[[C.controlsDisabled]" | 
| 185               i18n-content="login_ControllerPairingScreen_rejectCodeBtn"> | 185               i18n-content="loginControllerPairingScreenRejectCodeBtn"> | 
| 186           </paper-button> | 186           </paper-button> | 
| 187           <paper-button on-tap="userActed" action="acceptCode" | 187           <paper-button on-tap="userActed" action="acceptCode" | 
| 188               disabled$="[[C.controlsDisabled]]" | 188               disabled$="[[C.controlsDisabled]]" | 
| 189               i18n-content="login_ControllerPairingScreen_acceptCodeBtn"> | 189               i18n-content="loginControllerPairingScreenAcceptCodeBtn"> | 
| 190           </paper-button> | 190           </paper-button> | 
| 191         </controller-pairing-page> | 191         </controller-pairing-page> | 
| 192 | 192 | 
| 193         <controller-pairing-page name="host-update" class="split"> | 193         <controller-pairing-page name="host-update" class="split"> | 
| 194           <div class="title" | 194           <div class="title" | 
| 195               i18n-content="login_ControllerPairingScreen_updateTitle"> | 195               i18n-content="loginControllerPairingScreenUpdateTitle"> | 
| 196           </div> | 196           </div> | 
| 197           <div i18n-content="login_ControllerPairingScreen_updateText"></div> | 197           <div i18n-content="loginControllerPairingScreenUpdateText"></div> | 
| 198           <paper-progress indeterminate></paper-progress> | 198           <paper-progress indeterminate></paper-progress> | 
| 199         </controller-pairing-page> | 199         </controller-pairing-page> | 
| 200 | 200 | 
| 201         <controller-pairing-page name="host-connection-lost" class="split"> | 201         <controller-pairing-page name="host-connection-lost" class="split"> | 
| 202           <div class="title" | 202           <div class="title" | 
| 203               i18n-content="login_ControllerPairingScreen_connectionLostTitle"> | 203               i18n-content="loginControllerPairingScreenConnectionLostTitle"> | 
| 204           </div> | 204           </div> | 
| 205           <div i18n-content="login_ControllerPairingScreen_connectionLostText"> | 205           <div i18n-content="loginControllerPairingScreenConnectionLostText"> | 
| 206           </div> | 206           </div> | 
| 207           <paper-progress indeterminate></paper-progress> | 207           <paper-progress indeterminate></paper-progress> | 
| 208         </controller-pairing-page> | 208         </controller-pairing-page> | 
| 209 | 209 | 
| 210         <controller-pairing-page name="enrollment-introduction" class="split"> | 210         <controller-pairing-page name="enrollment-introduction" class="split"> | 
| 211           <div class="title" | 211           <div class="title" | 
| 212               i18n-content="login_ControllerPairingScreen_enrollTitle"> | 212               i18n-content="loginControllerPairingScreenEnrollTitle"> | 
| 213           </div> | 213           </div> | 
| 214           <p i18n-content="login_ControllerPairingScreen_enrollText1"></p> | 214           <p i18n-content="loginControllerPairingScreenEnrollText1"></p> | 
| 215           <p> | 215           <p> | 
| 216             <strong i18n-content="login_ControllerPairingScreen_enrollText2"> | 216             <strong i18n-content="loginControllerPairingScreenEnrollText2"> | 
| 217             </strong> | 217             </strong> | 
| 218           </p> | 218           </p> | 
| 219           <paper-button on-tap="userActed" action="proceedToAuthentication" | 219           <paper-button on-tap="userActed" action="proceedToAuthentication" | 
| 220               disabled$="[[C.controlsDisabled]]" | 220               disabled$="[[C.controlsDisabled]]" | 
| 221               i18n-content="login_ControllerPairingScreen_continueBtn"> | 221               i18n-content="loginControllerPairingScreenContinueBtn"> | 
| 222           </paper-button> | 222           </paper-button> | 
| 223         </controller-pairing-page> | 223         </controller-pairing-page> | 
| 224 | 224 | 
| 225         <controller-pairing-page name="authentication" class="split"> | 225         <controller-pairing-page name="authentication" class="split"> | 
| 226           <div class="title" | 226           <div class="title" | 
| 227               i18n-content="login_ControllerPairingScreen_enrollTitle"> | 227               i18n-content="loginControllerPairingScreenEnrollTitle"> | 
| 228           </div> | 228           </div> | 
| 229           <div>Not implemented.</div> | 229           <div>Not implemented.</div> | 
| 230         </controller-pairing-page> | 230         </controller-pairing-page> | 
| 231 | 231 | 
| 232         <controller-pairing-page name="host-enrollment" class="progress"> | 232         <controller-pairing-page name="host-enrollment" class="progress"> | 
| 233           <!-- This title contains <strong> tag inside. --> | 233           <!-- This title contains <strong> tag inside. --> | 
| 234           <html-echo class="title" | 234           <html-echo class="title" | 
| 235               content="[[getHostEnrollmentStepTitle_(C.enrollmentDomain)]]"> | 235               content="[[getHostEnrollmentStepTitle_(C.enrollmentDomain)]]"> | 
| 236           </html-echo> | 236           </html-echo> | 
| 237         </controller-pairing-page> | 237         </controller-pairing-page> | 
| 238 | 238 | 
| 239         <controller-pairing-page name="host-enrollment-error" class="progress"> | 239         <controller-pairing-page name="host-enrollment-error" class="progress"> | 
| 240           <div class="title" | 240           <div class="title" | 
| 241               i18n-content="login_ControllerPairingScreen_enrollmentErrorTitle"> | 241               i18n-content="loginControllerPairingScreenEnrollmentErrorTitle"> | 
| 242           </div> | 242           </div> | 
| 243           <div | 243           <div | 
| 244               i18n-content="login_ControllerPairingScreen_enrollmentErrorHostRes
     tarts"> | 244               i18n-content="loginControllerPairingScreenEnrollmentErrorHostResta
     rts"> | 
| 245           </div> | 245           </div> | 
| 246         </controller-pairing-page> | 246         </controller-pairing-page> | 
| 247 | 247 | 
| 248         <controller-pairing-page name="pairing-done" class="big-font"> | 248         <controller-pairing-page name="pairing-done" class="big-font"> | 
| 249           <div class="title" | 249           <div class="title" | 
| 250               i18n-content="login_ControllerPairingScreen_successTitle"> | 250               i18n-content="loginControllerPairingScreenSuccessTitle"> | 
| 251           </div> | 251           </div> | 
| 252           <div><span>[[getSuccessMessage_(selectedDevice)]]</div> | 252           <div><span>[[getSuccessMessage_(selectedDevice)]]</div> | 
| 253           <paper-button on-tap="userActed" action="startSession" | 253           <paper-button on-tap="userActed" action="startSession" | 
| 254               disabled$="{{C.controlsDisabled}}" | 254               disabled$="{{C.controlsDisabled}}" | 
| 255               i18n-content="login_ControllerPairingScreen_continueToHangoutsBtn"
     > | 255               i18n-content="loginControllerPairingScreenContinueToHangoutsBtn"> | 
| 256           </paper-button> | 256           </paper-button> | 
| 257         </controller-pairing-page> | 257         </controller-pairing-page> | 
| 258       </neon-animated-pages> | 258       </neon-animated-pages> | 
| 259     </paper-material> | 259     </paper-material> | 
| 260   </template> | 260   </template> | 
| 261 </dom-module> | 261 </dom-module> | 
| 262 | 262 | 
| OLD | NEW | 
|---|