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

Unified Diff: chrome/browser/resources/chromeos/merge_session_load.html

Issue 12340017: Revert 183647 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 10 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
Index: chrome/browser/resources/chromeos/merge_session_load.html
===================================================================
--- chrome/browser/resources/chromeos/merge_session_load.html (revision 183978)
+++ chrome/browser/resources/chromeos/merge_session_load.html (working copy)
@@ -1,61 +0,0 @@
-<!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>
« no previous file with comments | « chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698