4 files changed, 25 insertions, 17 deletions
diff --git a/chromium/chrome/browser/resources/settings/controls/controlled_button.html b/chromium/chrome/browser/resources/settings/controls/controlled_button.html
index af328098f62..79fb7d2e405 100644
--- a/chromium/chrome/browser/resources/settings/controls/controlled_button.html
+++ b/chromium/chrome/browser/resources/settings/controls/controlled_button.html
@@ -42,7 +42,7 @@
       }
     </style>
 
-    <cr-button class$="[[getClass_(actionButton)]]"
+    <cr-button class$="[[actionClass_]]"
       disabled="[[!buttonEnabled_(enforced_, disabled)]]">
       [[label]]
     </cr-button>
diff --git a/chromium/chrome/browser/resources/settings/controls/controlled_button.js b/chromium/chrome/browser/resources/settings/controls/controlled_button.js
index 43f07fd36c0..e751237cab2 100644
--- a/chromium/chrome/browser/resources/settings/controls/controlled_button.js
+++ b/chromium/chrome/browser/resources/settings/controls/controlled_button.js
@@ -11,11 +11,6 @@ Polymer({
   ],
 
   properties: {
-    actionButton: {
-      type: Boolean,
-      value: false,
-    },
-
     endJustified: {
       type: Boolean,
       value: false,
@@ -31,6 +26,12 @@ Polymer({
     },
 
     /** @private */
+    actionClass_: {
+      type: String,
+      value: ''
+    },
+
+    /** @private */
     enforced_: {
       type: Boolean,
       computed: 'isPrefEnforced(pref.*)',
@@ -38,6 +39,18 @@ Polymer({
     },
   },
 
+  /** @override */
+  attached: function() {
+    if (this.classList.contains('action-button')) {
+      this.actionClass_ = 'action-button';
+    }
+  },
+
+  /** Focus on the inner cr-button. */
+  focus: function() {
+    this.$$('cr-button').focus();
+  },
+
   /**
    * @param {!Event} e
    * @private
@@ -49,15 +62,6 @@ Polymer({
   },
 
   /**
-   * @param {!boolean} actionButton
-   * @return {string} Class of the cr-button.
-   * @private
-   */
-  getClass_: function(actionButton) {
-    return actionButton ? 'action-button' : '';
-  },
-
-  /**
    * @param {!boolean} enforced
    * @param {!boolean} disabled
    * @return {boolean} True if the button should be enabled.
diff --git a/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.html b/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.html
index 4a0026ee454..810fd0b8b00 100644
--- a/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.html
+++ b/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.html
@@ -13,13 +13,16 @@
       }
 
       #passwordPrompt {
-        padding: 0;
+        padding-bottom: 20px;
+        padding-inline-end: 0;
+        padding-inline-start: 0;
       }
     </style>
     <cr-dialog id="dialog" close-text="$i18n{close}">
       <div slot="title">$i18n{passwordPromptTitle}</div>
       <div slot="body">
-        <div id="passwordPrompt" class="settings-box first line-only">
+        <div id="passwordPrompt" class="settings-box first"
+            hidden="[[!passwordPromptText]]">
           [[passwordPromptText]]
         </div>
         <cr-input id="passwordInput" type="password"
diff --git a/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.js b/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.js
index 2fc160bfb77..574dd209c16 100644
--- a/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.js
+++ b/chromium/chrome/browser/resources/settings/controls/password_prompt_dialog.js
@@ -34,6 +34,7 @@ Polymer({
     passwordPromptText: {
       type: String,
       notify: true,
+      value: '',
     },
 
     /**