| OLD | NEW |
|---|
| 1 <!DOCTYPE HTML> | 1 <!DOCTYPE HTML> |
| 2 <html i18n-values="dir:textdirection;" id="t"> | 2 <html i18n-values="dir:textdirection;" id="t"> |
| 3 <head> | 3 <head> |
| 4 <meta charset="utf-8"> | 4 <meta charset="utf-8"> |
| 5 <title i18n-content="title"></title> | 5 <title i18n-content="title"></title> |
| 6 | 6 |
| 7 <!-- TODO(zelidrag) need a better icon here --> | 7 <!-- TODO(zelidrag) need a better icon here --> |
| 8 <link rel="icon" href="../../app/theme/history_favicon.png"> | 8 <link rel="icon" href="../../app/theme/history_favicon.png"> |
| 9 | 9 |
| 10 <script src="chrome://resources/js/class_list.js"></script> | 10 <script src="chrome://resources/js/class_list.js"></script> |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 <ul id="navbar"> | 92 <ul id="navbar"> |
| 93 </ul> | 93 </ul> |
| 94 <hr/> | 94 <hr/> |
| 95 <ul id="subpagesnav"> | 95 <ul id="subpagesnav"> |
| 96 </ul> | 96 </ul> |
| 97 </div> | 97 </div> |
| 98 <div id="mainview"> | 98 <div id="mainview"> |
| 99 <if expr="pp_ifdef('chromeos')"> | 99 <if expr="pp_ifdef('chromeos')"> |
| 100 <include src="options/chromeos_system_options.html"> | 100 <include src="options/chromeos_system_options.html"> |
| 101 <include src="options/chromeos_labs.html"> | 101 <include src="options/chromeos_labs.html"> |
| 102 <include src="options/sync_options.html" > | |
| 103 </if> | 102 </if> |
| 104 <include src="options/browser_options.html"> | 103 <include src="options/browser_options.html"> |
| 105 <include src="options/personal_options.html"> | 104 <include src="options/personal_options.html"> |
| 106 <include src="options/advanced_options.html"> | 105 <include src="options/advanced_options.html"> |
| 107 <include src="options/content_settings.html"> | 106 <include src="options/content_settings.html"> |
| 107 <include src="options/sync_options.html"> |
| 108 </div> | 108 </div> |
| 109 </div> | 109 </div> |
| 110 <script> | 110 <script> |
| 111 // Decorate the existing elements in the document. | 111 // Decorate the existing elements in the document. |
| 112 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox); | 112 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox); |
| 113 cr.ui.decorate('input[pref][type=range]', PrefRange); | 113 cr.ui.decorate('input[pref][type=range]', PrefRange); |
| 114 cr.ui.decorate('select[pref]', PrefSelect); | 114 cr.ui.decorate('select[pref]', PrefSelect); |
| 115 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); | 115 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); |
| 116 // TODO(zelidrag) add other elements here when we implement them | 116 // TODO(zelidrag) add other elements here when we implement them |
| 117 </script> | 117 </script> |
| 118 </body> | 118 </body> |
| 119 </html> | 119 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2979002:
Fix include of sync_options.html, which shouldn't be ChromeOS-only (Closed)
