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

Unified Diff: chrome/browser/resources/options2/browser_options.js

Issue 9513016: uber managed pref banners (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed merge Created 8 years, 10 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 | « no previous file | chrome/browser/resources/options2/content_settings.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/browser_options.js
diff --git a/chrome/browser/resources/options2/browser_options.js b/chrome/browser/resources/options2/browser_options.js
index dd8ab7a01794c454aef70e17fec30a0e09a2cae2..5bbc3bc1a27ce392f0e7272c5692a1257175defe 100644
--- a/chrome/browser/resources/options2/browser_options.js
+++ b/chrome/browser/resources/options2/browser_options.js
@@ -481,53 +481,12 @@ cr.define('options', function() {
* @private
*/
hideAdvancedSettings_: function() {
- $('advanced-settings').style.height = '0px'
+ $('advanced-settings').style.height = '0px';
$('advanced-settings-expander').innerHTML =
localStrings.getString('showAdvancedSettings');
},
/**
- * Updates managed banner visibility state. This function iterates over
- * all input fields of all subpages and if any of these is marked as managed
- * it triggers the managed banner to be visible.
- * @private
- */
- updateManagedBannerVisibility_: function() {
- var bannerDiv = $('managed-prefs-banner');
-
- var controlledByPolicy = false;
- var controlledByExtension = false;
- var inputElements = document.querySelectorAll('input[controlled-by]');
- var mainPages = document.querySelectorAll('#page-container .page');
- for (var i = 0, len = inputElements.length; i < len; i++) {
- if (inputElements[i].controlledBy == 'policy')
- controlledByPolicy = true;
- else if (inputElements[i].controlledBy == 'extension')
- controlledByExtension = true;
- }
- if (!controlledByPolicy && !controlledByExtension) {
- bannerDiv.hidden = true;
- for (var i = 0; i < mainPages.length; i++)
- mainPages[i].classList.remove('under-managed-prefs-banner');
- } else {
- bannerDiv.hidden = false;
- for (var i = 0; i < mainPages.length; i++)
- mainPages[i].classList.add('under-managed-prefs-banner');
-
- if (controlledByPolicy && !controlledByExtension) {
- $('managed-prefs-text').textContent =
- templateData.policyManagedPrefsBannerText;
- } else if (!controlledByPolicy && controlledByExtension) {
- $('managed-prefs-text').textContent =
- templateData.extensionManagedPrefsBannerText;
- } else if (controlledByPolicy && controlledByExtension) {
- $('managed-prefs-text').textContent =
- templateData.policyAndExtensionManagedPrefsBannerText;
- }
- }
- },
-
- /**
* Initializes a button for controlling screen brightness.
* @param {string} id Button ID.
* @param {string} callback Name of the callback function.
« no previous file with comments | « no previous file | chrome/browser/resources/options2/content_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698