| OLD | NEW |
|---|
| 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/select.css"> | 9 <link rel="stylesheet" href="chrome://resources/css/select.css"> |
| 10 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> | 10 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> |
| 11 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> | 11 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> |
| 12 <link rel="stylesheet" href="chrome://resources/css/tree.css"> | 12 <link rel="stylesheet" href="chrome://resources/css/tree.css"> |
| 13 <link rel="stylesheet" href="../shared/css/chrome_shared2.css"> | 13 <link rel="stylesheet" href="../shared/css/chrome_shared2.css"> |
| 14 <link rel="stylesheet" href="../uber/uber_shared.css"> | 14 <link rel="stylesheet" href="../uber/uber_shared.css"> |
| 15 <link rel="stylesheet" href="options_page.css"> | 15 <link rel="stylesheet" href="options_page.css"> |
| 16 <link rel="stylesheet" href="advanced_options.css"> | |
| 17 <link rel="stylesheet" href="alert_overlay.css"> | 16 <link rel="stylesheet" href="alert_overlay.css"> |
| 18 <link rel="stylesheet" href="autofill_options.css"> | 17 <link rel="stylesheet" href="autofill_options.css"> |
| 19 <link rel="stylesheet" href="autofill_overlay.css"> | 18 <link rel="stylesheet" href="autofill_overlay.css"> |
| 20 <link rel="stylesheet" href="browser_options.css"> | 19 <link rel="stylesheet" href="browser_options.css"> |
| 21 <link rel="stylesheet" href="clear_browser_data_overlay.css"> | 20 <link rel="stylesheet" href="clear_browser_data_overlay.css"> |
| 22 <link rel="stylesheet" href="content_settings.css"> | 21 <link rel="stylesheet" href="content_settings.css"> |
| 23 <link rel="stylesheet" href="cookies_view.css"> | 22 <link rel="stylesheet" href="cookies_view.css"> |
| 24 <link rel="stylesheet" href="font_settings.css"> | 23 <link rel="stylesheet" href="font_settings.css"> |
| 25 <if expr="pp_ifdef('enable_register_protocol_handler')"> | 24 <if expr="pp_ifdef('enable_register_protocol_handler')"> |
| 26 <link rel="stylesheet" href="handler_options.css"> | 25 <link rel="stylesheet" href="handler_options.css"> |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 <include src="chromeos/proxy.html"> | 136 <include src="chromeos/proxy.html"> |
| 138 </if> | 137 </if> |
| 139 </div> | 138 </div> |
| 140 | 139 |
| 141 <div id="main-content"> | 140 <div id="main-content"> |
| 142 <div id="mainview"> | 141 <div id="mainview"> |
| 143 <div id="managed-prefs-banner" class="managed-prefs-banner" hidden> | 142 <div id="managed-prefs-banner" class="managed-prefs-banner" hidden> |
| 144 <span id="managed-prefs-icon" class="managed-prefs-icon"></span> | 143 <span id="managed-prefs-icon" class="managed-prefs-icon"></span> |
| 145 <span id="managed-prefs-text" class="managed-prefs-text"></span> | 144 <span id="managed-prefs-text" class="managed-prefs-text"></span> |
| 146 </div> | 145 </div> |
| 146 <!-- TODO(csilv): Remove subpage-backdrop --> |
| 147 <div id="subpage-backdrop" hidden></div> | 147 <div id="subpage-backdrop" hidden></div> |
| 148 <div id="mainview-content"> | 148 <div id="mainview-content"> |
| 149 <div id="page-container"> | 149 <div id="page-container"> |
| 150 <!-- Please keep the main pages in desired order of display. This will | |
| 151 allow search results to display in the desired order. --> | |
| 152 <include src="search_page.html"> | 150 <include src="search_page.html"> |
| 153 <include src="browser_options.html"> | 151 <include src="browser_options.html"> |
| 154 </div> | 152 </div> |
| 153 <!-- TODO(csilv): Remove subpage-sheet-container-1 --> |
| 155 <div id="subpage-sheet-container-1" | 154 <div id="subpage-sheet-container-1" |
| 156 class="subpage-sheet-container transparent" hidden> | 155 class="subpage-sheet-container transparent" hidden> |
| 157 <div id="subpage-sheet-1" class="subpage-sheet"> | |
| 158 <div class="subpage-sheet-contents"> | |
| 159 <include src="advanced_options.html"> | |
| 160 </div> | |
| 161 </div> | |
| 162 </div> | 156 </div> |
| 163 </div> | 157 </div> |
| 164 </div> | 158 </div> |
| 165 </div> | 159 </div> |
| 166 <script src="chrome://settings-frame/strings.js"></script> | 160 <script src="chrome://settings-frame/strings.js"></script> |
| 167 <script src="chrome://resources/js/i18n_template.js"></script> | 161 <script src="chrome://resources/js/i18n_template.js"></script> |
| 168 <script src="chrome://resources/js/i18n_process.js"></script> | 162 <script src="chrome://resources/js/i18n_process.js"></script> |
| 169 </body> | 163 </body> |
| 170 </html> | 164 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9560005:
[uber page] Merge advanced options page into browser options. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/