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

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

Issue 14325003: Clean up managed user settings dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix broken merge 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
Index: chrome/browser/resources/options/managed_user_exceptions_area.js
diff --git a/chrome/browser/resources/options/managed_user_exceptions_area.js b/chrome/browser/resources/options/managed_user_exceptions_area.js
index b9be5a726f601b274cf6bd6029944878d2d7de4d..b6a9e15157d7059d91d29c197e0dda7fa8d2516c 100644
--- a/chrome/browser/resources/options/managed_user_exceptions_area.js
+++ b/chrome/browser/resources/options/managed_user_exceptions_area.js
@@ -21,7 +21,6 @@ cr.define('options.managedUserSettings', function() {
*/
function ExceptionsListItem(exception) {
var el = cr.doc.createElement('div');
- el.contentType = 'manual-exceptions';
el.dataItem = exception;
el.__proto__ = ExceptionsListItem.prototype;
el.decorate();
@@ -441,7 +440,7 @@ cr.define('options.managedUserSettings', function() {
*/
function ManagedUserSettingsExceptionsArea() {
OptionsPage.call(this, 'manualExceptions',
- loadTimeData.getString('managedUserSettingsPageTabTitle'),
+ loadTimeData.getString('manualExceptionsTabTitle'),
'managed-user-exceptions-area');
}
@@ -464,8 +463,7 @@ cr.define('options.managedUserSettings', function() {
/** @override */
canShowPage: function() {
- return ManagedUserSettings.getInstance().authenticationState ==
- options.ManagedUserAuthentication.AUTHENTICATED;
+ return ManagedUserSettings.getInstance().isAuthenticated;
},
};

Powered by Google App Engine
This is Rietveld 408576698