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

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

Issue 12594029: Create interface to manage manual exceptions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Load the overlay only when managed users are available. Created 7 years, 8 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
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 42ae2b104188aa0e671538a5e33a7bd8fbfb801c..d62526bed08617d930629dcf8cc9ec88c467fb03 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -19,6 +19,8 @@ var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay;
var FactoryResetOverlay = options.FactoryResetOverlay;
var ManagedUserSetPassphraseOverlay = options.ManagedUserSetPassphraseOverlay;
var ManagedUserSettings = options.ManagedUserSettings;
+var ManagedUserSettingsExceptionsArea =
+ options.managedUserSettings.ManagedUserSettingsExceptionsArea;
var FontSettings = options.FontSettings;
var HandlerOptions = options.HandlerOptions;
var HomePageOverlay = options.HomePageOverlay;
@@ -145,6 +147,8 @@ function load() {
OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),
BrowserOptions.getInstance());
if (loadTimeData.getBoolean('managedUsersEnabled')) {
+ OptionsPage.registerOverlay(ManagedUserSettingsExceptionsArea.getInstance(),
+ ManagedUserSettings.getInstance());
OptionsPage.registerOverlay(ManagedUserSetPassphraseOverlay.getInstance(),
ManagedUserSettings.getInstance(),
[$('set-passphrase')]);
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698