make search box in settings page not get hidden behind enterprise warning

chrome/browser/resources/options2/browser_options.js

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 1fbe3cce331ade70497a647e0c82d70d7880e1ae..3325461c8b9dd51a330432f6778fe338c7281702 100644
--- a/chrome/browser/resources/options2/browser_options.js
+++ b/chrome/browser/resources/options2/browser_options.js
@@ -224,6 +224,48 @@ cr.define('options', function() {
     },
 
     /**
+     * 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. The banner can be enforced

[James Hawkins, 2012/02/05 05:13:10]

enforced?  Do you mean 'forced' here?

[Tyler Breisacher (Chromium), 2012/02/06 18:46:50]

This part of the comment is copied from the original in options_page.js. I'm not
sure what the comment was trying to say. I'll look into it.

[Tyler Breisacher (Chromium), 2012/02/06 19:08:58]

I'm not sure what the 'managed flag of this class' is. I can't find any such
flag in options_page.js -- it sounds like this is referring to code that no
longer exists.

+     * being on through the managed flag of this class but it can not be forced
+     * being off if managed items exist.
+     */
+    updateManagedBannerVisibility_: function() {

[James Hawkins, 2012/02/05 05:13:10]

If this applies to all sub-pages, why is the implementation now in
BrowserOptions?

[Tyler Breisacher (Chromium), 2012/02/06 18:46:50]

The banner only *shows* on the BrowserOptions page, but it reflects the presence
of managed prefs on *any* page.

+      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.classList.add('hidden');
+        for (var i = 0; i < mainPages.length; i++)
+          mainPages[i].classList.remove('under-managed-prefs-banner');
+      } else {
+        bannerDiv.classList.remove('hidden');
+        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.
@@ -588,6 +630,7 @@ cr.define('options', function() {
     'updateAccountPicture',
     'updateAutocompleteSuggestions',
     'updateHomePageLabel',
+    'updateManagedBannerVisibility',
     'updateSearchEngines',
     'updateStartupPages',
   ].forEach(function(name) {