chrome/browser/resources/chromeos/merge_session_load.html - Issue 12256046: Added interstitial page for merge session.

Side by Side Diff: chrome/browser/resources/chromeos/merge_session_load.html

Issue 12256046: Added interstitial page for merge session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/chromeos/login/merge_session_throttle.cc ('K') | « chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <!DOCTYPE html>

	2 <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 nit: Get rid of id="template_root" since it seems not used. zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > nit: Get rid of id="template_root" since it seems not used. Done.
	3 <head>

	4 <title i18n-content="title">

	5 </title>

	6 <style>

	7 html {

	8 height: 100%;

	9 }

	10 body {

	11 color: #000;

	12 font-family: arial, sans-serif;

	13 background: white;

	14 width: 100%;

	15 height: 100%;

	16 padding: 0;

	17 margin: 0;

	18 display: -webkit-box;

	19 -webkit-box-orient: vertical;

	20 -webkit-box-align: stretch;
	xiyuan 2013/02/15 23:43:07 The above two probably have no effect when body ha The above two probably have no effect when body has only one block child. zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > The above two probably have no effect when body has only one block child. Done.
	21 visibility: hidden;

	22 -webkit-user-select: none;
	xiyuan 2013/02/15 23:43:07 nit: alpha sort the list and -webkit-.. rules goes nit: alpha sort the list and -webkit-.. rules goes before other ones. zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > nit: alpha sort the list and -webkit-.. rules goes before other ones. Done.
	23 }

	24

	25 .header {
	xiyuan 2013/02/15 23:43:07 seems not used. You need either a #header here or seems not used. You need either a #header here or change the div to have class=header. zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > seems not used. You need either a #header here or change the div to have > class=header. Done.
	26 float: left;
	xiyuan 2013/02/15 23:43:07 why we need float here? why we need float here? zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > why we need float here? Done.
	27 height: 5;
	xiyuan 2013/02/15 23:43:07 5px or 5%? 5px or 5%? zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > 5px or 5%? Done.
	28 width: 80%;

	29 font-family: Sans-serif;

	30 padding: 3px;
	xiyuan 2013/02/15 23:43:07 nit: alpha sort the list nit: alpha sort the list zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > nit: alpha sort the list Done.
	31 }

	32 </style>

	33 <script src="../../../../ui/webui/resources/js/local_strings.js"></script>

	34

	35 <script>

	36 var localStrings = new LocalStrings();

	37

	38 function sendCommand(cmd) {

	39 window.domAutomationController.setAutomationId(1);

	40 window.domAutomationController.send(cmd);

	41 }

	42

	43 // Show the interstitial page.

	44 function showPage() {

	45 document.body.style.visibility = 'visible';

	46 }

	47

	48 // Show the interstitial page.

	49 function forceLoad() {

	50 sendCommand('proceed');

	51 }

	52

	53 document.addEventListener('DOMContentLoaded', function() {

	54 var show_delay_time = localStrings.getString('show_delay_time');

	55 var total_wait_time = localStrings.getString('total_wait_time');

	56 window.setTimeout(showPage, show_delay_time);

	57 window.setTimeout(forceLoad, total_wait_time);

	58 });

	59 </script>

	60

	61 <body oncontextmenu="return false;">

	62 <div id="header" i18n-content="heading">
	xiyuan 2013/02/15 23:43:07 class="header"? Otherwise, you need to change your class="header"? Otherwise, you need to change your css selector above to "#header". zel 2013/02/15 23:51:05 Done. Show quoted text On 2013/02/15 23:43:07, xiyuan wrote: > class="header"? Otherwise, you need to change your css selector above to > "#header". Done.
	63 </div>

	64 </body>

	65 </html>

OLD	NEW