chrome/browser/resources/profile_signin_confirmation.html - Issue 12302015: Merge 182702

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/profile_signin_confirmation.html

Issue 12302015: Merge 182702 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/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

« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/profile_signin_confirmation.js » ('j') | no next file with comments »

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

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

3 <head>	3 <head>

4 <meta charset="utf-8">	4 <meta charset="utf-8">

5 <title i18n-content="dialogTitle"></title>	5 <title i18n-content="dialogTitle"></title>

6 <script src="chrome://resources/js/cr.js"></script>	6 <script src="chrome://resources/js/cr.js"></script>

7 <script src="chrome://resources/js/load_time_data.js"></script>	7 <script src="chrome://resources/js/load_time_data.js"></script>

8 <script src="chrome://resources/js/util.js"></script>	8 <script src="chrome://resources/js/util.js"></script>

9 <script src="strings.js"></script>	9 <script src="strings.js"></script>

10 <script src="profile_signin_confirmation.js"></script>	10 <script src="profile_signin_confirmation.js"></script>

11 </head>	11 </head>

12 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">	12 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">

13 <h1 i18n-content="dialogTitle"></h1>	13 <h1 i18n-content="dialogTitle"></h1>

14 <p id="dialog-message"></p>	14 <p id="dialog-message"></p>

15 <a i18n-content="learnMoreText"	15 <a i18n-content="learnMoreText"

16 href="http://support.google.com/chromeos/bin/answer.py?hl=en&answer=133154 9"	16 href="http://support.google.com/chromeos/bin/answer.py?hl=en&answer=133154 9"

17 target="_blank">	17 target="_blank">

18 </a>	18 </a>

19 <p id="dialog-prompt"></p>	19 <p id="dialog-prompt"></p>

20 <button id="create-button" i18n-content="createProfileButtonText"></button>	20 <button id="create-button" i18n-content="createProfileButtonText"></button>

21 <button id="continue-button" i18n-content="continueButtonText"></button>	21 <button id="continue-button" i18n-content="continueButtonText"></button>

22 <button id="cancel-button" i18n-content="cancelButtonText"></button>	22 <button id="cancel-button" i18n-content="cancelButtonText"></button>

23	23

24 <!-- Must be last in the DOM: processes elements and inserts i18n strings -->	24 <!-- Must be last in the DOM: processes elements and inserts i18n strings -->

25 <script src="chrome://resources/js/i18n_template2.js"></script>	25 <script src="chrome://resources/js/i18n_template2.js"></script>

26 </body>	26 </body>

27 </html>	27 </html>

OLD	NEW