| OLD | NEW | 
|---|
| 1 <link rel="import" href="chrome://resources/html/assert.html"> | 1 <link rel="import" href="chrome://resources/html/assert.html"> | 
| 2 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 2 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
     -icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
     -icon-button-light.html"> | 
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
     -radio-group.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper
     -radio-group.html"> | 
| 8 <link rel="import" href="../controls/settings_toggle_button.html"> | 8 <link rel="import" href="../controls/settings_toggle_button.html"> | 
| 9 <link rel="import" href="easy_unlock_browser_proxy.html"> | 9 <link rel="import" href="easy_unlock_browser_proxy.html"> | 
| 10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 10 <link rel="import" href="easy_unlock_turn_off_dialog.html"> | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 35           width: 100%; | 35           width: 100%; | 
| 36         }; | 36         }; | 
| 37       } | 37       } | 
| 38 | 38 | 
| 39       paper-radio-button > .start { | 39       paper-radio-button > .start { | 
| 40         flex: 1; | 40         flex: 1; | 
| 41       } | 41       } | 
| 42     </style> | 42     </style> | 
| 43 | 43 | 
| 44     <div> | 44     <div> | 
| 45       <div class="list-frame"> | 45       <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 
| 46         <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> | 46         <div class="list-frame"> | 
| 47           <paper-radio-button name="password"> | 47           <paper-radio-group id="unlockType" selected="{{selectedUnlockType}}"> | 
| 48             <div class="start"> | 48             <paper-radio-button name="password"> | 
| 49               $i18n{lockScreenPasswordOnly} | 49               <div class="start"> | 
| 50               <div class="secondary"> | 50                 $i18n{lockScreenPasswordOnly} | 
| 51                 $i18n{lockScreenHighSecurity} | 51                 <div class="secondary"> | 
|  | 52                   $i18n{lockScreenHighSecurity} | 
|  | 53                 </div> | 
| 52               </div> | 54               </div> | 
| 53             </div> | 55             </paper-radio-button> | 
| 54           </paper-radio-button> | 56             <paper-radio-button name="pin+password"> | 
| 55           <paper-radio-button name="pin+password"> | 57               <div class="start"> | 
| 56             <div class="start"> | 58                 $i18n{lockScreenPinOrPassword} | 
| 57               $i18n{lockScreenPinOrPassword} | 59                 <div class="secondary"> | 
| 58               <div class="secondary"> | 60                   $i18n{lockScreenMediumSecurity} | 
| 59                 $i18n{lockScreenMediumSecurity} | 61                 </div> | 
| 60               </div> | 62               </div> | 
| 61             </div> | 63               <template is="dom-if" | 
| 62             <template is="dom-if" | 64                   if="[[showConfigurePinButton_(selectedUnlockType)]]"> | 
| 63                 if="[[showConfigurePinButton_(selectedUnlockType)]]"> | 65                 <paper-button id="setupPinButton" class="secondary-button" | 
| 64               <paper-button id="setupPinButton" class="secondary-button" | 66                     on-tap="onConfigurePin_"> | 
| 65                   on-tap="onConfigurePin_"> | 67                   [[getSetupPinText_(hasPin)]] | 
| 66                 [[getSetupPinText_(hasPin)]] | 68                 </paper-button> | 
| 67               </paper-button> | 69               </template> | 
| 68             </template> | 70             </paper-radio-button> | 
| 69           </paper-radio-button> | 71           </paper-radio-group> | 
| 70         </paper-radio-group> | 72         </div> | 
| 71       </div> | 73       </template> | 
| 72 | 74 | 
| 73       <div id="screenLockDiv" class="settings-box"> | 75       <div id="screenLockDiv" class="settings-box"> | 
| 74         <settings-toggle-button class="start" | 76         <settings-toggle-button class="start" | 
| 75             pref="{{prefs.settings.enable_screen_lock}}" | 77             pref="{{prefs.settings.enable_screen_lock}}" | 
| 76             label="$i18n{enableScreenlock}"> | 78             label="$i18n{enableScreenlock}"> | 
| 77         </settings-toggle-button> | 79         </settings-toggle-button> | 
| 78       </div> | 80       </div> | 
| 79 | 81 | 
| 80       <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 82       <template is="dom-if" if="[[fingerprintUnlockEnabled_]]"> | 
| 81         <div id="fingerprintDiv"> | 83         <div id="fingerprintDiv"> | 
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 150       <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 152       <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 
| 151         <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 153         <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 
| 152             on-close="onEasyUnlockTurnOffDialogClose_"> | 154             on-close="onEasyUnlockTurnOffDialogClose_"> | 
| 153         </easy-unlock-turn-off-dialog> | 155         </easy-unlock-turn-off-dialog> | 
| 154       </template> | 156       </template> | 
| 155     </div> | 157     </div> | 
| 156   </template> | 158   </template> | 
| 157 | 159 | 
| 158   <script src="lock_screen.js"></script> | 160   <script src="lock_screen.js"></script> | 
| 159 </dom-module> | 161 </dom-module> | 
| OLD | NEW | 
|---|