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

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

Issue 12335051: Merge 182894 - 3rd attempt (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html i18n-values="dir:textdirection"> 2 <html i18n-values="dir:textdirection">
3 <head> 3 <head>
4 <title i18n-content="title"> 4 <title i18n-content="title">
5 </title> 5 </title>
6 <style> 6 <style>
7 html { 7 html {
8 height: 100%; 8 height: 100%;
9 } 9 }
10 body { 10 body {
11 -webkit-user-select: none; 11 -webkit-user-select: none;
12 background: white; 12 background: white;
13 color: #000; 13 color: #000;
14 display: -webkit-box; 14 display: -webkit-box;
15 font-family: arial, sans-serif; 15 font-family: arial, sans-serif;
16 height: 100%; 16 height: 100%;
17 margin: 0; 17 margin: 0;
18 padding: 0; 18 padding: 0;
19 visibility: hidden; 19 visibility: hidden;
20 width: 100%; 20 width: 100%;
21 } 21 }
22 22
23 .header { 23 .header {
24 font-family: Sans-serif; 24 font-family: Sans-serif;
25 padding: 3px; 25 padding: 3px;
26 width: 80%; 26 width: 80%;
27 } 27 }
28 </style> 28 </style>
29 <script src="../../../../ui/webui/resources/js/local_strings.js"></script> 29 <script src="../shared/js/local_strings.js"></script>
30 30
31 <script> 31 <script>
32 var localStrings = new LocalStrings(); 32 var localStrings = new LocalStrings();
33 33
34 function sendCommand(cmd) { 34 function sendCommand(cmd) {
35 window.domAutomationController.setAutomationId(1); 35 window.domAutomationController.setAutomationId(1);
36 window.domAutomationController.send(cmd); 36 window.domAutomationController.send(cmd);
37 } 37 }
38 38
39 // Show the interstitial page. 39 // Show the interstitial page.
(...skipping 12 matching lines...) Expand all
52 window.setTimeout(showPage, show_delay_time); 52 window.setTimeout(showPage, show_delay_time);
53 window.setTimeout(forceLoad, total_wait_time); 53 window.setTimeout(forceLoad, total_wait_time);
54 }); 54 });
55 </script> 55 </script>
56 56
57 <body oncontextmenu="return false;"> 57 <body oncontextmenu="return false;">
58 <div class="header" i18n-content="heading"> 58 <div class="header" i18n-content="heading">
59 </div> 59 </div>
60 </body> 60 </body>
61 </html> 61 </html>
OLDNEW
« 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