Chromium Code Reviews Chromium Code Reviews
Issue 12256046:
Added interstitial page for merge session. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: chrome/browser/resources/chromeos/merge_session_load.html |
| diff --git a/chrome/browser/resources/chromeos/merge_session_load.html b/chrome/browser/resources/chromeos/merge_session_load.html |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..61ce26544ba62ad3499cf1faff2780dd5cfe4827 |
| --- /dev/null |
| +++ b/chrome/browser/resources/chromeos/merge_session_load.html |
| @@ -0,0 +1,65 @@ |
| +<!DOCTYPE html> |
| +<html id="template_root" i18n-values="dir:textdirection"> |
|
xiyuan
2013/02/15 23:43:07
nit: Get rid of id="template_root" since it seems
zel
2013/02/15 23:51:05
Done.
|
| +<head> |
| +<title i18n-content="title"> |
| +</title> |
| +<style> |
| +html { |
| + height: 100%; |
| +} |
| +body { |
| + color: #000; |
| + font-family: arial, sans-serif; |
| + background: white; |
| + width: 100%; |
| + height: 100%; |
| + padding: 0; |
| + margin: 0; |
| + display: -webkit-box; |
| + -webkit-box-orient: vertical; |
| + -webkit-box-align: stretch; |
|
xiyuan
2013/02/15 23:43:07
The above two probably have no effect when body ha
zel
2013/02/15 23:51:05
Done.
|
| + visibility: hidden; |
| + -webkit-user-select: none; |
|
xiyuan
2013/02/15 23:43:07
nit: alpha sort the list and -webkit-.. rules goes
zel
2013/02/15 23:51:05
Done.
|
| +} |
| + |
| +.header { |
|
xiyuan
2013/02/15 23:43:07
seems not used. You need either a #header here or
zel
2013/02/15 23:51:05
Done.
|
| + float: left; |
|
xiyuan
2013/02/15 23:43:07
why we need float here?
zel
2013/02/15 23:51:05
Done.
|
| + height: 5; |
|
xiyuan
2013/02/15 23:43:07
5px or 5%?
zel
2013/02/15 23:51:05
Done.
|
| + width: 80%; |
| + font-family: Sans-serif; |
| + padding: 3px; |
|
xiyuan
2013/02/15 23:43:07
nit: alpha sort the list
zel
2013/02/15 23:51:05
Done.
|
| +} |
| +</style> |
| +<script src="../../../../ui/webui/resources/js/local_strings.js"></script> |
| + |
| +<script> |
| +var localStrings = new LocalStrings(); |
| + |
| +function sendCommand(cmd) { |
| + window.domAutomationController.setAutomationId(1); |
| + window.domAutomationController.send(cmd); |
| +} |
| + |
| +// Show the interstitial page. |
| +function showPage() { |
| + document.body.style.visibility = 'visible'; |
| +} |
| + |
| +// Show the interstitial page. |
| +function forceLoad() { |
| + sendCommand('proceed'); |
| +} |
| + |
| +document.addEventListener('DOMContentLoaded', function() { |
| + var show_delay_time = localStrings.getString('show_delay_time'); |
| + var total_wait_time = localStrings.getString('total_wait_time'); |
| + window.setTimeout(showPage, show_delay_time); |
| + window.setTimeout(forceLoad, total_wait_time); |
| +}); |
| +</script> |
| + |
| +<body oncontextmenu="return false;"> |
| + <div id="header" i18n-content="heading"> |
|
xiyuan
2013/02/15 23:43:07
class="header"? Otherwise, you need to change your
zel
2013/02/15 23:51:05
Done.
|
| + </div> |
| +</body> |
| +</html> |
