| 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..54bb0ec508823b2a319aea9854441ab872114ed1
|
| --- /dev/null
|
| +++ b/chrome/browser/resources/chromeos/merge_session_load.html
|
| @@ -0,0 +1,61 @@
|
| +<!DOCTYPE html>
|
| +<html i18n-values="dir:textdirection">
|
| +<head>
|
| +<title i18n-content="title">
|
| +</title>
|
| +<style>
|
| +html {
|
| + height: 100%;
|
| +}
|
| +body {
|
| + -webkit-user-select: none;
|
| + background: white;
|
| + color: #000;
|
| + display: -webkit-box;
|
| + font-family: arial, sans-serif;
|
| + height: 100%;
|
| + margin: 0;
|
| + padding: 0;
|
| + visibility: hidden;
|
| + width: 100%;
|
| +}
|
| +
|
| +.header {
|
| + font-family: Sans-serif;
|
| + padding: 3px;
|
| + width: 80%;
|
| +}
|
| +</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 class="header" i18n-content="heading">
|
| + </div>
|
| +</body>
|
| +</html>
|
|
|
Chromium Code Reviews
Issue 12256046:
Added interstitial page for merge session. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src