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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options2/options.html

Issue 9668010: Move proxy handling into network details. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing jsdoc. 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
« chrome/browser/resources/options2/chromeos/internet_detail.js ('K') | « chrome/browser/resources/options2/chromeos/internet_options.js ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html id="t" i18n-values="dir:textdirection"> 2 <html id="t" i18n-values="dir:textdirection">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title i18n-content="optionsPageTitle"></title> 5 <title i18n-content="optionsPageTitle"></title>
6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON"> 6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON">
7 <link rel="stylesheet" href="chrome://resources/css/list.css"> 7 <link rel="stylesheet" href="chrome://resources/css/list.css">
8 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 8 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
9 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 9 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
10 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> 10 <link rel="stylesheet" href="chrome://resources/css/throbber.css">
(...skipping 24 matching lines...) Expand all
35 <link rel="stylesheet" href="subpages_tab_controls.css"> 35 <link rel="stylesheet" href="subpages_tab_controls.css">
36 <link rel="stylesheet" href="startup_overlay.css"> 36 <link rel="stylesheet" href="startup_overlay.css">
37 <link rel="stylesheet" href="../sync_setup_overlay.css"> 37 <link rel="stylesheet" href="../sync_setup_overlay.css">
38 <if expr="pp_ifdef('chromeos')"> 38 <if expr="pp_ifdef('chromeos')">
39 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 39 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
40 <link rel="stylesheet" href="chromeos/bluetooth.css"> 40 <link rel="stylesheet" href="chromeos/bluetooth.css">
41 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 41 <link rel="stylesheet" href="chromeos/change_picture_options.css">
42 <link rel="stylesheet" href="chromeos/internet_detail.css"> 42 <link rel="stylesheet" href="chromeos/internet_detail.css">
43 <link rel="stylesheet" href="chromeos/internet_options_page.css"> 43 <link rel="stylesheet" href="chromeos/internet_options_page.css">
44 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 44 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
45 <link rel="stylesheet" href="chromeos/proxy.css">
46 </if> 45 </if>
47 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')"> 46 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
48 <link rel="stylesheet" href="chromeos/virtual_keyboard.css"> 47 <link rel="stylesheet" href="chromeos/virtual_keyboard.css">
49 </if> 48 </if>
50 <if expr="not is_win and not is_macosx"> 49 <if expr="not is_win and not is_macosx">
51 <link rel="stylesheet" href="certificate_manager.css"> 50 <link rel="stylesheet" href="certificate_manager.css">
52 <link rel="stylesheet" href="certificate_tree.css"> 51 <link rel="stylesheet" href="certificate_tree.css">
53 </if> 52 </if>
54 <script src="chrome://resources/css/tree.css.js"></script> 53 <script src="chrome://resources/css/tree.css.js"></script>
55 <script src="chrome://resources/js/cr.js"></script> 54 <script src="chrome://resources/js/cr.js"></script>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 <include src="handler_options.html"> 126 <include src="handler_options.html">
128 </if> 127 </if>
129 <if expr="not is_win and not is_macosx"> 128 <if expr="not is_win and not is_macosx">
130 <include src="certificate_restore_overlay.html"> 129 <include src="certificate_restore_overlay.html">
131 <include src="certificate_backup_overlay.html"> 130 <include src="certificate_backup_overlay.html">
132 <include src="certificate_edit_ca_trust_overlay.html"> 131 <include src="certificate_edit_ca_trust_overlay.html">
133 <include src="certificate_import_error_overlay.html"> 132 <include src="certificate_import_error_overlay.html">
134 </if> 133 </if>
135 </div> 134 </div>
136 <div id="overlay-container-3" class="overlay transparent" hidden> 135 <div id="overlay-container-3" class="overlay transparent" hidden>
137 <if expr="pp_ifdef('chromeos')">
138 <include src="chromeos/proxy.html">
139 </if>
140 </div> 136 </div>
141 137
142 <div id="main-content"> 138 <div id="main-content">
143 <div id="mainview"> 139 <div id="mainview">
144 <div id="mainview-content"> 140 <div id="mainview-content">
145 <div id="page-container"> 141 <div id="page-container">
146 <!-- Please keep the main pages in desired order of display. This will 142 <!-- Please keep the main pages in desired order of display. This will
147 allow search results to display in the desired order. --> 143 allow search results to display in the desired order. -->
148 <include src="search_page.html"> 144 <include src="search_page.html">
149 <include src="browser_options.html"> 145 <include src="browser_options.html">
150 </div> 146 </div>
151 </div> 147 </div>
152 </div> 148 </div>
153 </div> 149 </div>
154 150
155 <div id="templates" hidden> 151 <div id="templates" hidden>
156 <div id="managed-prefs-banner" class="managed-prefs-banner"> 152 <div id="managed-prefs-banner" class="managed-prefs-banner">
157 <div class="managed-prefs-gradient"> 153 <div class="managed-prefs-gradient">
158 <span id="managed-prefs-text" class="managed-prefs-text"></span> 154 <span id="managed-prefs-text" class="managed-prefs-text"></span>
159 </div> 155 </div>
160 </div> 156 </div>
161 </div> 157 </div>
162 158
163 <script src="chrome://settings-frame/strings.js"></script> 159 <script src="chrome://settings-frame/strings.js"></script>
164 <script src="chrome://resources/js/i18n_template.js"></script> 160 <script src="chrome://resources/js/i18n_template.js"></script>
165 <script src="chrome://resources/js/i18n_process.js"></script> 161 <script src="chrome://resources/js/i18n_process.js"></script>
166 </body> 162 </body>
167 </html> 163 </html>
OLDNEW
« chrome/browser/resources/options2/chromeos/internet_detail.js ('K') | « chrome/browser/resources/options2/chromeos/internet_options.js ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698