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

Side by Side Diff: chrome/browser/resources/options2/browser_options.js

Issue 9307026: make search box in settings page not get hidden behind enterprise warning (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: .hidden -> [hidden] 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/options2/content_settings.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cr.define('options', function() { 5 cr.define('options', function() {
6 var OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 var ArrayDataModel = cr.ui.ArrayDataModel; 7 var ArrayDataModel = cr.ui.ArrayDataModel;
8 var RepeatingButton = cr.ui.RepeatingButton; 8 var RepeatingButton = cr.ui.RepeatingButton;
9 9
10 // 10 //
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 }; 226 };
227 227
228 this.sessionRestoreEnabled_ = templateData.enable_restore_session_state; 228 this.sessionRestoreEnabled_ = templateData.enable_restore_session_state;
229 if (this.sessionRestoreEnabled_) { 229 if (this.sessionRestoreEnabled_) {
230 $('old-startup-last-text').hidden = true; 230 $('old-startup-last-text').hidden = true;
231 $('new-startup-last-text').hidden = false; 231 $('new-startup-last-text').hidden = false;
232 } 232 }
233 }, 233 },
234 234
235 /** 235 /**
236 * Updates managed banner visibility state. This function iterates over
237 * all input fields of all subpages and if any of these is marked as managed
238 * it triggers the managed banner to be visible.
239 * @private
240 */
241 updateManagedBannerVisibility_: function() {
242 var bannerDiv = $('managed-prefs-banner');
243
244 var controlledByPolicy = false;
245 var controlledByExtension = false;
246 var inputElements = document.querySelectorAll('input[controlled-by]');
247 var mainPages = document.querySelectorAll('#page-container .page');
248 for (var i = 0, len = inputElements.length; i < len; i++) {
249 if (inputElements[i].controlledBy == 'policy')
250 controlledByPolicy = true;
251 else if (inputElements[i].controlledBy == 'extension')
252 controlledByExtension = true;
253 }
254 if (!controlledByPolicy && !controlledByExtension) {
255 bannerDiv.hidden = true;
256 for (var i = 0; i < mainPages.length; i++)
257 mainPages[i].classList.remove('under-managed-prefs-banner');
258 } else {
259 bannerDiv.hidden = false;
260 for (var i = 0; i < mainPages.length; i++)
261 mainPages[i].classList.add('under-managed-prefs-banner');
262
263 if (controlledByPolicy && !controlledByExtension) {
264 $('managed-prefs-text').textContent =
265 templateData.policyManagedPrefsBannerText;
266 } else if (!controlledByPolicy && controlledByExtension) {
267 $('managed-prefs-text').textContent =
268 templateData.extensionManagedPrefsBannerText;
269 } else if (controlledByPolicy && controlledByExtension) {
270 $('managed-prefs-text').textContent =
271 templateData.policyAndExtensionManagedPrefsBannerText;
272 }
273 }
274 },
275
276 /**
236 * Initializes a button for controlling screen brightness. 277 * Initializes a button for controlling screen brightness.
237 * @param {string} id Button ID. 278 * @param {string} id Button ID.
238 * @param {string} callback Name of the callback function. 279 * @param {string} callback Name of the callback function.
239 */ 280 */
240 initBrightnessButton_: function(id, callback) { 281 initBrightnessButton_: function(id, callback) {
241 var button = $(id); 282 var button = $(id);
242 cr.ui.decorate(button, RepeatingButton); 283 cr.ui.decorate(button, RepeatingButton);
243 button.repeatInterval = 300; 284 button.repeatInterval = 300;
244 button.addEventListener(RepeatingButton.Event.BUTTON_HELD, function(e) { 285 button.addEventListener(RepeatingButton.Event.BUTTON_HELD, function(e) {
245 chrome.send(callback); 286 chrome.send(callback);
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 [ 630 [
590 'getStartStopSyncButton', 631 'getStartStopSyncButton',
591 'setGtkThemeButtonEnabled', 632 'setGtkThemeButtonEnabled',
592 'setInstantFieldTrialStatus', 633 'setInstantFieldTrialStatus',
593 'setProfilesInfo', 634 'setProfilesInfo',
594 'setProfilesSectionVisible', 635 'setProfilesSectionVisible',
595 'setThemesResetButtonEnabled', 636 'setThemesResetButtonEnabled',
596 'updateAccountPicture', 637 'updateAccountPicture',
597 'updateAutocompleteSuggestions', 638 'updateAutocompleteSuggestions',
598 'updateHomePageLabel', 639 'updateHomePageLabel',
640 'updateManagedBannerVisibility',
599 'updateSearchEngines', 641 'updateSearchEngines',
600 'updateSyncState', 642 'updateSyncState',
601 'updateStartupPages', 643 'updateStartupPages',
602 ].forEach(function(name) { 644 ].forEach(function(name) {
603 BrowserOptions[name] = function() { 645 BrowserOptions[name] = function() {
604 var instance = BrowserOptions.getInstance(); 646 var instance = BrowserOptions.getInstance();
605 return instance[name + '_'].apply(instance, arguments); 647 return instance[name + '_'].apply(instance, arguments);
606 }; 648 };
607 }); 649 });
608 650
(...skipping 15 matching lines...) Expand all
624 BrowserOptions.getLoggedInUsername = function() { 666 BrowserOptions.getLoggedInUsername = function() {
625 return BrowserOptions.getInstance().username_; 667 return BrowserOptions.getInstance().username_;
626 }; 668 };
627 } 669 }
628 670
629 // Export 671 // Export
630 return { 672 return {
631 BrowserOptions: BrowserOptions 673 BrowserOptions: BrowserOptions
632 }; 674 };
633 }); 675 });
OLDNEW
« 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