chrome/browser/resources/options/options.js - Issue 566863005: Expose the Website Settings page in the Content Setting page if it is enabled via flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Nits. 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

« chrome/browser/resources/options/content_settings.html ('K') | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/website_settings.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/options.js

diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js

index 8f119802ddef65b2c5c44b5da88babe97305d7b4..ae82a2599fa1bee5fe0ac48d3733a669a8befb89 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(),