| Index: chrome/browser/resources/options.html
|
| diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
|
| index 2c6a3b066544e166f154a140bb08765d8ab2000c..83d9e7bd05d91c2649083e60b6b143270f29580b 100644
|
| --- a/chrome/browser/resources/options.html
|
| +++ b/chrome/browser/resources/options.html
|
| @@ -36,10 +36,12 @@ function load() {
|
| if (cr.isChromeOS) {
|
| OptionsPage.register(SystemOptions.getInstance());
|
| }
|
| +
|
| OptionsPage.register(BrowserOptions.getInstance());
|
| OptionsPage.register(PersonalOptions.getInstance());
|
| OptionsPage.register(AdvancedOptions.getInstance());
|
| - OptionsPage.register(ContentSettings.getInstance());
|
| + OptionsPage.registerSubPage(ContentSettings.getInstance());
|
| +
|
| if (cr.isChromeOS) {
|
| var labsOptions = new OptionsPage('labs',
|
| localStrings.getString('labsPage'),
|
|
|