chrome/browser/resources/chromeos/proxy_settings.html - Issue 9702011: Migrate proxy-settings.html to options2.

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

Issue 9702011: Migrate proxy-settings.html to options2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix copyright notices. Created 8 years, 9 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/resources/chromeos/proxy_settings.css ('k') | chrome/browser/resources/chromeos/proxy_settings.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 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">	4 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">

5 <link rel="stylesheet" href="chrome://resources/css/list.css">	5 <link rel="stylesheet" href="chrome://resources/css/list.css">

6 <link rel="stylesheet" href="chrome://resources/css/widgets.css">	6 <link rel="stylesheet" href="chrome://resources/css/widgets.css">

7 <link rel="stylesheet" href="../options/options_page.css">	7

8 <link rel="stylesheet" href="../options/chromeos/internet_options_page.css">	8 <link rel="stylesheet" href="../options2/options_page.css">

9 <link rel="stylesheet" href="../options/chromeos/proxy.css">	9 <link rel="stylesheet" href="../options2/chromeos/internet_detail.css">

10 <link rel="stylesheet" href="proxy_settings.css">	10 <link rel="stylesheet" href="proxy_settings.css">

11

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

13 <script src="chrome://resources/js/cr/event_target.js"></script>	12 <script src="chrome://resources/js/cr/event_target.js"></script>

14 <script src="chrome://resources/js/cr/ui.js"></script>	13 <script src="chrome://resources/js/cr/ui.js"></script>

15 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>	14 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>

16 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>	15 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>

17 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>	16 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>

18 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></scrip t>	17 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></scrip t>

19 <script src="chrome://resources/js/cr/ui/list_item.js"></script>	18 <script src="chrome://resources/js/cr/ui/list_item.js"></script>

20 <script src="chrome://resources/js/cr/ui/list.js"></script>	19 <script src="chrome://resources/js/cr/ui/list.js"></script>

21 <script src="chrome://resources/js/local_strings.js"></script>	20 <script src="chrome://resources/js/local_strings.js"></script>

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

23 <script src="../options/preferences.js"></script>	22 <script src="../options/preferences.js"></script>

24 <script src="../options/pref_ui.js"></script>	23 <script src="../options/pref_ui.js"></script>

25 <script src="../options/options_page.js"></script>	24 <script src="../options/options_page.js"></script>

26 <script src="../options/chromeos/proxy_options.js"></script>	25 <script src="../options2/chromeos/internet_detail.js"></script>

27 <script src="../options/chromeos/proxy_rules_list.js"></script>	26 <script src="../options2/chromeos/proxy_rules_list.js"></script>

28 <script src="proxy_settings.js"></script>	27 <script src="proxy_settings.js"></script>

29 </head>	28 </head>

30	29

31 <!-- We do not override the fontSize because it is defined in	30 <!-- We do not override the fontSize because it is defined in

32 internet_options_page.css. -->	31 internet_options_page.css. -->

33 <body i18n-values=".style.fontFamily:fontfamily">	32 <body i18n-values=".style.fontFamily:fontfamily">

34 <include src="../options/chromeos/proxy.html">	33 <include src="../options2/chromeos/internet_detail.html">

35 </body>	34 </body>

36 </html>	35 </html>

OLD	NEW