Index: chrome/browser/resources/options/password_manager.html |
diff --git a/chrome/browser/resources/options/password_manager.html b/chrome/browser/resources/options/password_manager.html |
index 888fb5cf2ec8147eedcf6b049a148bdbe05ae3d3..ab93d92b8ffc804e16110b5aed985d43e40973bc 100644 |
--- a/chrome/browser/resources/options/password_manager.html |
+++ b/chrome/browser/resources/options/password_manager.html |
@@ -2,38 +2,48 @@ |
<div class="close-button"></div> |
<h1 i18n-content="passwordsPage"></h1> |
<div class="content-area"> |
- <div id="auto-signin-block" class="checkbox" hidden> |
- <label> |
- <input pref="profile.password_manager_auto_signin" type="checkbox"> |
- <span i18n-content="autoSigninTitle"></span> |
- </label> |
- <div class="setting-extra-description"> |
- <span i18n-content="autoSigninDescription"></span> |
+ <div class="password-manager-default"> |
Garrett Casto
2015/06/23 23:42:35
Wow, this is a terrible diff.
|
+ <div id="auto-signin-block" class="checkbox" hidden> |
+ <label> |
+ <input pref="profile.password_manager_auto_signin" type="checkbox"> |
+ <span i18n-content="autoSigninTitle"></span> |
+ </label> |
+ <div class="setting-extra-description"> |
+ <span i18n-content="autoSigninDescription"></span> |
+ </div> |
</div> |
- </div> |
- <div id="password-list-headers"> |
- <div id="passwords-title"> |
- <h3 i18n-content="savedPasswordsTitle"></h3> |
+ <div id="password-list-headers"> |
+ <div id="passwords-title"> |
+ <h3 i18n-content="savedPasswordsTitle"></h3> |
+ </div> |
+ <div id="password-search-column"> |
+ <input id="password-search-box" type="search" |
+ i18n-values="placeholder:passwordSearchPlaceholder" incremental> |
+ </div> |
</div> |
- <div id="password-search-column"> |
- <input id="password-search-box" type="search" |
- i18n-values="placeholder:passwordSearchPlaceholder" incremental> |
+ <list id="saved-passwords-list" class="settings-list"></list> |
+ <div id="saved-passwords-list-empty-placeholder" |
+ class="settings-list-empty" hidden> |
+ <span i18n-content="passwordsNoPasswordsDescription"></span> |
+ <a target="_blank" i18n-content="learnMore" |
+ i18n-values="href:passwordManagerLearnMoreURL"></a> |
+ </div> |
+ <h3 i18n-content="passwordExceptionsTitle"></h3> |
+ <list id="password-exceptions-list" class="settings-list"></list> |
+ <div id="password-exceptions-list-empty-placeholder" hidden |
+ class="settings-list-empty"> |
+ <span i18n-content="passwordsNoExceptionsDescription"></span> |
+ <a id="exceptions-learn-more" target="_blank" i18n-content="learnMore" |
+ i18n-values="href:passwordManagerLearnMoreURL"></a> |
</div> |
</div> |
- <list id="saved-passwords-list" class="settings-list"></list> |
- <div id="saved-passwords-list-empty-placeholder" |
- class="settings-list-empty" hidden> |
- <span i18n-content="passwordsNoPasswordsDescription"></span> |
- <a target="_blank" i18n-content="learnMore" |
- i18n-values="href:passwordManagerLearnMoreURL"></a> |
- </div> |
- <h3 i18n-content="passwordExceptionsTitle"></h3> |
- <list id="password-exceptions-list" class="settings-list"></list> |
- <div id="password-exceptions-list-empty-placeholder" hidden |
- class="settings-list-empty"> |
- <span i18n-content="passwordsNoExceptionsDescription"></span> |
- <a id="exceptions-learn-more" target="_blank" i18n-content="learnMore" |
- i18n-values="href:passwordManagerLearnMoreURL"></a> |
+ <div class="import-password-complete" hidden> |
+ <div id="import-complete-header"> |
+ <strong i18n-content="importPasswordCompletedMessage"></strong> |
+ </div> |
+ <div id="import-complete-image"> |
+ <img src="../../../../ui/webui/resources/images/success.png"> |
+ </div> |
</div> |
</div> |
<div class="action-area"> |
@@ -46,7 +56,14 @@ |
</span> |
<div class="spacer-div"></div> |
<div class="button-strip"> |
- <button id="password-manager-confirm" i18n-content="done"></button> |
+ <button id="password-manager-import" class="password-manager-default" |
+ i18n-content="passwordManagerImportPasswordButtonText"></button> |
+ <button id="password-manager-export" class="password-manager-default" |
+ i18n-content="passwordManagerExportPasswordButtonText"></button> |
+ <button id="password-manager-confirm" class="password-manager-default" |
+ i18n-content="done"></button> |
+ <button id="password-manager-import-confirm" |
+ class="import-password-complete" i18n-content="done" hidden></button> |
</div> |
</div> |
</div> |