chrome/browser/resources/chromeos/merge_session_load.html - Issue 12340017: Revert 183647

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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:

OLD	NEW
	(Empty)
1 <!DOCTYPE html>

2 <html i18n-values="dir:textdirection">

3 <head>

4 <title i18n-content="title">

5 </title>

6 <style>

7 html {

8 height: 100%;

9 }

10 body {

11 -webkit-user-select: none;

12 background: white;

13 color: #000;

14 display: -webkit-box;

15 font-family: arial, sans-serif;

16 height: 100%;

17 margin: 0;

18 padding: 0;

19 visibility: hidden;

20 width: 100%;

21 }

22

23 .header {

24 font-family: Sans-serif;

25 padding: 3px;

26 width: 80%;

27 }

28 </style>

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

30

31 <script>

32 var localStrings = new LocalStrings();

33

34 function sendCommand(cmd) {

35 window.domAutomationController.setAutomationId(1);

36 window.domAutomationController.send(cmd);

37 }

38

39 // Show the interstitial page.

40 function showPage() {

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

42 }

43

44 // Show the interstitial page.

45 function forceLoad() {

46 sendCommand('proceed');

47 }

48

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

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

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

52 window.setTimeout(showPage, show_delay_time);

53 window.setTimeout(forceLoad, total_wait_time);

54 });

55 </script>

56

57 <body oncontextmenu="return false;">

58 <div class="header" i18n-content="heading">

59 </div>

60 </body>

61 </html>

OLD	NEW