MD Settings: Network: SIM unlock: Fix focus and cancel

chrome/browser/resources/settings/internet_page/network_siminfo.html

Index: chrome/browser/resources/settings/internet_page/network_siminfo.html
diff --git a/chrome/browser/resources/settings/internet_page/network_siminfo.html b/chrome/browser/resources/settings/internet_page/network_siminfo.html
index d300cf8361a1700cfb10df12781b337858ecc6ca..7ed34a037c7c2aae9ce8c7e5aabf1937ea01f82b 100644
--- a/chrome/browser/resources/settings/internet_page/network_siminfo.html
+++ b/chrome/browser/resources/settings/internet_page/network_siminfo.html
@@ -84,18 +84,18 @@
         $i18n{networkSimChangePin}
       </paper-button>
       <paper-toggle-button id="simLockButton"
-          on-change="onSimLockEnabledChange_"
-          checked="[[networkProperties.Cellular.SIMLockStatus.LockEnabled]]"
+          on-change="onSimLockEnabledChange_" checked="{{lockEnabled_}}"
           aria-labelledby="simLockToggleLabel">
       </paper-toggle-button>
     </div>
 
     <!-- Enter PIN dialog -->
     <dialog is="cr-dialog" id="enterPinDialog" close-text="$i18n{close}"
-        on-close="onEnterPinDialogClosed_">
+        on-cancel="onEnterPinDialogCancel_"
+        on-close="onEnterPinDialogClose_">
       <div class="title">$i18n{networkSimEnterPinTitle}</div>
       <div class="body">
-        <paper-input id="enterPin" class="pin" no-label-float
+        <paper-input id="enterPin" class="pin" no-label-float autofocus
             label="$i18n{networkSimEnterPin}">
           <iron-a11y-keys keys="enter" on-keys-pressed="sendEnterPin_">
           </iron-a11y-keys>
@@ -116,7 +116,7 @@
         on-close="onChangePinDialogClose_">
       <div class="title">$i18n{networkSimChangePinTitle}</div>
       <div class="body">
-        <paper-input id="changePinOld" class="pin" no-label-float
+        <paper-input id="changePinOld" class="pin" no-label-float autofocus
             label="$i18n{networkSimEnterOldPin}">
         </paper-input>
         <paper-input id="changePinNew1" class="pin" no-label-float
@@ -143,7 +143,7 @@
         on-close="onUnlockPinDialogClose_">
       <div class="title">$i18n{networkSimLockedTitle}</div>
       <div class="body">
-        <paper-input id="unlockPin" class="pin" no-label-float
+        <paper-input id="unlockPin" class="pin" no-label-float autofocus
             label="$i18n{networkSimEnterPin}">
           <iron-a11y-keys keys="enter" on-keys-pressed="sendUnlockPin_">
           </iron-a11y-keys>
@@ -167,7 +167,7 @@
         <div>
           Enter the 8-digit PIN Unblocking Key provided by your carrier
         </div>
-        <paper-input id="unlockPuk" class="puk" no-label-float
+        <paper-input id="unlockPuk" class="puk" no-label-float autofocus
             label="$i18n{networkSimEnterPuk}">
         </paper-input>
         <paper-input id="unlockPin1" class="pin" no-label-float