| Index: chrome/browser/resources/options.html
|
| diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
|
| index 596213bebd0c908e04fcdfec8711de4568aa2101..bea313b733ec19a5dcead3f0de4cc4d3f5400f96 100644
|
| --- a/chrome/browser/resources/options.html
|
| +++ b/chrome/browser/resources/options.html
|
| @@ -43,7 +43,7 @@
|
| */
|
| function load() {
|
| localStrings = new LocalStrings();
|
| -
|
| +
|
| if (cr.isChromeOS) {
|
| OptionsPage.register(SystemOptions.getInstance());
|
| OptionsPage.register(AccountsOptions.getInstance());
|
| @@ -101,6 +101,7 @@ window.onpopstate = function(e) {
|
| <if expr="pp_ifdef('chromeos')">
|
| <link rel="stylesheet" href="options/chromeos_accounts_options_page.css">
|
| </if>
|
| +<link rel="stylesheet" href="options/personal_options.css">
|
| </head>
|
| <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
|
| <div class="header">
|
| @@ -135,15 +136,16 @@ window.onpopstate = function(e) {
|
| </if>
|
| <include src="options/browser_options.html">
|
| <include src="options/personal_options.html">
|
| + <include src="options/sync_options.html">
|
| <include src="options/advanced_options.html">
|
| <include src="options/content_settings.html">
|
| - <include src="options/sync_options.html">
|
| </div>
|
| </div>
|
|
|
| <script>
|
| // Decorate the existing elements in the document.
|
| cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox);
|
| +cr.ui.decorate('input[pref][type=radio]', PrefRadio);
|
| cr.ui.decorate('input[pref][type=range]', PrefRange);
|
| cr.ui.decorate('select[pref]', PrefSelect);
|
| cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
|
|
|