Revert "Revert 53989 - Implement new mock for user options page per chromium-os:5028"

chrome/browser/resources/options/chromeos_accounts_options.html

Index: chrome/browser/resources/options/chromeos_accounts_options.html
diff --git a/chrome/browser/resources/options/chromeos_accounts_options.html b/chrome/browser/resources/options/chromeos_accounts_options.html
index 1369cd55fbcc5fc2ebeaad5ad258b3781ec15e3e..14392595fcf734e0e5fa4d095004460ca9949407 100644
--- a/chrome/browser/resources/options/chromeos_accounts_options.html
+++ b/chrome/browser/resources/options/chromeos_accounts_options.html
@@ -2,6 +2,21 @@
   <h1 i18n-content="accountsPage"></h1>
   <div class="option">
     <table class="option-control-table">
+    <tr><td>
+      <table class="user-list-table">
+        <tr><td>
+          <list id="userList"></list>
+        </td></tr>
+        <tr><td class="user-name-edit-row">
+          <label><span i18n-content="add_users"></span><br>
+          <input id="userNameEdit" type="text"
+              i18n-values="placeholder:username_edit_hint">
+          </span>
+          </label>
+        </td></tr>
+      </table>
+    </td></tr>
+    <tr><td>&nbsp;</td></tr>
     <tr>
       <td class="option-name"><label><input id="allowBwsiCheck"
            pref="cros.accounts.allowBWSI" type="checkbox"><span
@@ -13,17 +28,10 @@
            i18n-content="allow_guest"></span></label></td>
     </tr>
     <tr>
-      <td class="option-name" i18n-content="user_list_title"></td>
+      <td class="option-name"><label><input id="showUserNamesCheck"
+           pref="cros.accounts.showUserNamesOnSignIn" type="checkbox"><span
+           i18n-content="show_user_on_signin"></span></label></td>
     </tr>
-    <tr><td class="option-name">
-      <list id="userList"></list>
-    </td></tr>
-    <tr><td class="option-name">
-      <button id="addUserButton"
-          i18n-content="add_user"></button>
-      <button id="removeUserButton" disabled
-          i18n-content="remove_user"></button>
-    </td></tr>
     </table>
   </div>
 </div>