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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 var AddLanguageOverlay = options.AddLanguageOverlay; 5 var AddLanguageOverlay = options.AddLanguageOverlay;
6 var AlertOverlay = options.AlertOverlay; 6 var AlertOverlay = options.AlertOverlay;
7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; 7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; 8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
9 var AutofillOptions = options.AutofillOptions; 9 var AutofillOptions = options.AutofillOptions;
10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner; 10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner;
(...skipping 27 matching lines...) Expand all
38 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay; 38 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay;
39 var SearchEngineManager = options.SearchEngineManager; 39 var SearchEngineManager = options.SearchEngineManager;
40 var SearchPage = options.SearchPage; 40 var SearchPage = options.SearchPage;
41 var StartupOverlay = options.StartupOverlay; 41 var StartupOverlay = options.StartupOverlay;
42 var SupervisedUserCreateConfirmOverlay = 42 var SupervisedUserCreateConfirmOverlay =
43 options.SupervisedUserCreateConfirmOverlay; 43 options.SupervisedUserCreateConfirmOverlay;
44 var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay; 44 var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay;
45 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay; 45 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay;
46 var SyncSetupOverlay = options.SyncSetupOverlay; 46 var SyncSetupOverlay = options.SyncSetupOverlay;
47 var WebsiteSettingsEditor = options.WebsiteSettings.WebsiteSettingsEditor; 47 var WebsiteSettingsEditor = options.WebsiteSettings.WebsiteSettingsEditor;
48 var WebsiteSettingsManager = options.WebsiteSettingsManager; 48 var WebsiteSettingsManager = options.ContentSettings.WebsiteSettingsManager;
49 var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay; 49 var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay;
50 50
51 /** 51 /**
52 * DOMContentLoaded handler, sets up the page. 52 * DOMContentLoaded handler, sets up the page.
53 */ 53 */
54 function load() { 54 function load() {
55 // Decorate the existing elements in the document. 55 // Decorate the existing elements in the document.
56 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox); 56 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox);
57 cr.ui.decorate('input[pref][type=number]', options.PrefNumber); 57 cr.ui.decorate('input[pref][type=number]', options.PrefNumber);
58 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio); 58 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 $('spelling-enabled-control').pref, 109 $('spelling-enabled-control').pref,
110 $('spelling-enabled-control').metric), 110 $('spelling-enabled-control').metric),
111 BrowserOptions.getInstance()); 111 BrowserOptions.getInstance());
112 } 112 }
113 PageManager.registerOverlay(new HotwordConfirmDialog(), 113 PageManager.registerOverlay(new HotwordConfirmDialog(),
114 BrowserOptions.getInstance()); 114 BrowserOptions.getInstance());
115 PageManager.registerOverlay(ContentSettings.getInstance(), 115 PageManager.registerOverlay(ContentSettings.getInstance(),
116 BrowserOptions.getInstance(), 116 BrowserOptions.getInstance(),
117 [$('privacyContentSettingsButton')]); 117 [$('privacyContentSettingsButton')]);
118 PageManager.registerOverlay(WebsiteSettingsManager.getInstance(), 118 PageManager.registerOverlay(WebsiteSettingsManager.getInstance(),
119 BrowserOptions.getInstance(), 119 ContentSettings.getInstance());
120 [$('website-management-button')]);
121 PageManager.registerOverlay(WebsiteSettingsEditor.getInstance(), 120 PageManager.registerOverlay(WebsiteSettingsEditor.getInstance(),
122 WebsiteSettingsManager.getInstance()); 121 WebsiteSettingsManager.getInstance());
123 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(), 122 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(),
124 ContentSettings.getInstance()); 123 ContentSettings.getInstance());
125 PageManager.registerOverlay(CookiesView.getInstance(), 124 PageManager.registerOverlay(CookiesView.getInstance(),
126 ContentSettings.getInstance(), 125 ContentSettings.getInstance(),
127 [$('privacyContentSettingsButton'), 126 [$('privacyContentSettingsButton'),
128 $('show-cookies-button')]); 127 $('show-cookies-button')]);
129 PageManager.registerOverlay(CreateProfileOverlay.getInstance(), 128 PageManager.registerOverlay(CreateProfileOverlay.getInstance(),
130 BrowserOptions.getInstance()); 129 BrowserOptions.getInstance());
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 }; 273 };
275 274
276 /** 275 /**
277 * Listener for the |popstate| event. 276 * Listener for the |popstate| event.
278 * @param {Event} e The |popstate| event. 277 * @param {Event} e The |popstate| event.
279 */ 278 */
280 window.onpopstate = function(e) { 279 window.onpopstate = function(e) {
281 var pageName = PageManager.getPageNameFromPath(); 280 var pageName = PageManager.getPageNameFromPath();
282 PageManager.setState(pageName, e.state); 281 PageManager.setState(pageName, e.state);
283 }; 282 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698