| 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"> |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 <div id="mainview-content"> | 144 <div id="mainview-content"> |
| 145 <div id="page-container"> | 145 <div id="page-container"> |
| 146 <!-- Please keep the main pages in desired order of display. This will | 146 <!-- Please keep the main pages in desired order of display. This will |
| 147 allow search results to display in the desired order. --> | 147 allow search results to display in the desired order. --> |
| 148 <include src="search_page.html"> | 148 <include src="search_page.html"> |
| 149 <include src="browser_options.html"> | 149 <include src="browser_options.html"> |
| 150 </div> | 150 </div> |
| 151 <!-- TODO(csilv): Remove subpage-sheet-container-1 --> | 151 <!-- TODO(csilv): Remove subpage-sheet-container-1 --> |
| 152 <div id="subpage-sheet-container-1" | 152 <div id="subpage-sheet-container-1" |
| 153 class="subpage-sheet-container transparent" hidden> | 153 class="subpage-sheet-container transparent" hidden> |
| 154 <div id="subpage-sheet-1" class="subpage-sheet"> | |
| 155 <div class="subpage-sheet-contents"> | |
| 156 <include src="advanced_options.html"> | |
| 157 </div> | |
| 158 </div> | |
| 159 </div> | 154 </div> |
| 160 </div> | 155 </div> |
| 161 </div> | 156 </div> |
| 162 </div> | 157 </div> |
| 163 | 158 |
| 164 <div id="templates" hidden> | 159 <div id="templates" hidden> |
| 165 <div id="managed-prefs-banner" class="managed-prefs-banner"> | 160 <div id="managed-prefs-banner" class="managed-prefs-banner"> |
| 166 <div class="managed-prefs-gradient"> | 161 <div class="managed-prefs-gradient"> |
| 167 <span id="managed-prefs-text" class="managed-prefs-text"></span> | 162 <span id="managed-prefs-text" class="managed-prefs-text"></span> |
| 168 </div> | 163 </div> |
| 169 </div> | 164 </div> |
| 170 </div> | 165 </div> |
| 171 | 166 |
| 172 <script src="chrome://settings-frame/strings.js"></script> | 167 <script src="chrome://settings-frame/strings.js"></script> |
| 173 <script src="chrome://resources/js/i18n_template.js"></script> | 168 <script src="chrome://resources/js/i18n_template.js"></script> |
| 174 <script src="chrome://resources/js/i18n_process.js"></script> | 169 <script src="chrome://resources/js/i18n_process.js"></script> |
| 175 </body> | 170 </body> |
| 176 </html> | 171 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9570033:
fix merge conflict between r124495 and r124470 (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src