Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/sync_setup_overlay.html

Issue 10539128: Set timeout in sync setup (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move back setting up of backend-timer into DisplaySpinner() Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/sync_setup_overlay.js » ('j') | chrome/browser/ui/webui/sync_setup_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/sync_setup_overlay.html
diff --git a/chrome/browser/resources/sync_setup_overlay.html b/chrome/browser/resources/sync_setup_overlay.html
index fa036b44e56e47b46e83657ce251778c879e2a73..ffa39982934ddb0360bb6593b8be1b8b1289b680 100644
--- a/chrome/browser/resources/sync_setup_overlay.html
+++ b/chrome/browser/resources/sync_setup_overlay.html
@@ -286,7 +286,7 @@
<a i18n-values="href:encryptionHelpURL" target="_blank"
i18n-content="learnMore"></a>
</div>
- <div id="sync-custom-passphrase"
+ <div id="sync-custom-passphrase"
class="reset-hidden" hidden>
<div id="sync-passphrase-message">
<span i18n-content="sectionExplicitMessagePrefix"></span>
@@ -361,6 +361,13 @@
<input id="sync-spinner-cancel" type="button" i18n-values="value:cancel">
</div>
</div>
+ <div id="sync-setup-timeout" hidden>
+ <h1 i18n-content="syncSetupTimeoutTitle"></h1>
+ <div i18n-content="syncSetupTimeoutContent" class="content-area"></div>
James Hawkins 2012/06/26 23:00:14 s/div/span/
peria 2012/06/29 07:11:17 Done.
+ <div class="action-area button-strip">
+ <input id="timeout-ok" type="button" i18n-values="value:ok">
James Hawkins 2012/06/26 23:00:14 Use <button></button>
peria 2012/06/29 07:11:17 Done.
+ </div>
+ </div>
<div id="sync-setup-stop-syncing" hidden>
<h1 i18n-content="stopSyncingTitle"></h1>
<div class="content-area">
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/sync_setup_overlay.js » ('j') | chrome/browser/ui/webui/sync_setup_handler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698