MD Settings: CrOS: Focus elements on dialog close

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

Index: chrome/browser/resources/settings/internet_page/network_siminfo.js
diff --git a/chrome/browser/resources/settings/internet_page/network_siminfo.js b/chrome/browser/resources/settings/internet_page/network_siminfo.js
index 8772be4c69a704c9089385d36108a00133f9b818..9d8b710ebfa789e707cdcff9beca99b523a96684 100644
--- a/chrome/browser/resources/settings/internet_page/network_siminfo.js
+++ b/chrome/browser/resources/settings/internet_page/network_siminfo.js
@@ -99,8 +99,7 @@ Polymer({
     if (!showUnlockPuk)
       return;
 
-    this.error_ = ErrorType.NONE;
-    this.$.unlockPukDialog.showModal();
+    this.showUnlockPukDialog_();
   },
 
   /**
@@ -220,17 +219,13 @@ Polymer({
     }.bind(this));
   },
 
-  /**
-   * Opens the Unlock PUK dialog.
-   * @param {Event} event
-   * @private
-   */
-  unlockPuk_: function(event) {
+  /** @private */
+  showUnlockPukDialog_: function() {
     this.error_ = ErrorType.NONE;
-    this.$.unlockPukDialog.showModal();
     this.$.unlockPuk.value = '';
     this.$.unlockPin1.value = '';
     this.$.unlockPin2.value = '';
+    this.$.unlockPukDialog.showModal();
   },
 
   /**
@@ -342,6 +337,21 @@ Polymer({
       return false;
     }
     return true;
-  }
+  },
+
+  /** @private */
+  onEnterPinDialogClosed_: function() {
+    this.$$('#simLockButton').focus();
+  },
+
+  /** @private */
+  onChangePinDialogClose_: function() {
+    this.$$('#changePinButton').focus();
+  },
+
+  /** @private */
+  onUnlockPinDialogClose_: function() {
+    this.$$('#unlockPinButton').focus();
+  },
 });
 })();