Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2271)

Unified Diff: chrome/browser/resources/options/options.js

Issue 566863005: Expose the Website Settings page in the Content Setting page if it is enabled via flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/options.js
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index be478545c3eec70559343f31f2d6091a0a56d0c8..df959b7cc4daf6005a178ee743566742823f4aa1 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -45,7 +45,7 @@ var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay;
var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay;
var SyncSetupOverlay = options.SyncSetupOverlay;
var WebsiteSettingsEditor = options.WebsiteSettings.WebsiteSettingsEditor;
-var WebsiteSettingsManager = options.WebsiteSettingsManager;
+var WebsiteSettingsManager = options.ContentSettings.WebsiteSettingsManager;
var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay;
/**
@@ -116,8 +116,7 @@ function load() {
BrowserOptions.getInstance(),
[$('privacyContentSettingsButton')]);
PageManager.registerOverlay(WebsiteSettingsManager.getInstance(),
- BrowserOptions.getInstance(),
- [$('website-management-button')]);
+ ContentSettings.getInstance());
PageManager.registerOverlay(WebsiteSettingsEditor.getInstance(),
WebsiteSettingsManager.getInstance());
PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(),

Powered by Google App Engine
This is Rietveld 408576698