| Index: chrome/browser/resources/options/options.js
|
| diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
|
| index 7e1812ffa7e5f73f1bf9044675f96286921b8de7..4235eb517bc316204c6c0d2e6d10d6caabdc5fce 100644
|
| --- a/chrome/browser/resources/options/options.js
|
| +++ b/chrome/browser/resources/options/options.js
|
| @@ -11,6 +11,8 @@ var AutoFillOptions = options.AutoFillOptions;
|
| var BrowserOptions = options.BrowserOptions;
|
| var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
|
| var ContentSettings = options.ContentSettings;
|
| +var ContentSettingsExceptionsArea =
|
| + options.contentSettings.ContentSettingsExceptionsArea;
|
| var CookiesView = options.CookiesView;
|
| var EditSearchEngineOverlay = options.EditSearchEngineOverlay;
|
| var FontSettings = options.FontSettings;
|
| @@ -91,6 +93,8 @@ function load() {
|
| OptionsPage.register(AdvancedOptions.getInstance());
|
| OptionsPage.registerSubPage(ContentSettings.getInstance(),
|
| AdvancedOptions.getInstance());
|
| + OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(),
|
| + ContentSettings.getInstance());
|
| OptionsPage.registerSubPage(CookiesView.getInstance(),
|
| ContentSettings.getInstance());
|
| OptionsPage.registerSubPage(FontSettings.getInstance(),
|
|
|