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

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: update comment 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 const OptionsPage = options.OptionsPage; 6 const OptionsPage = options.OptionsPage;
7 const ArrayDataModel = cr.ui.ArrayDataModel; 7 const ArrayDataModel = cr.ui.ArrayDataModel;
8 const RepeatingButton = cr.ui.RepeatingButton; 8 const RepeatingButton = cr.ui.RepeatingButton;
9 9
10 // 10 //
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 }); 229 });
230 230
231 this.sessionRestoreEnabled_ = templateData.enable_restore_session_state; 231 this.sessionRestoreEnabled_ = templateData.enable_restore_session_state;
232 if (this.sessionRestoreEnabled_) { 232 if (this.sessionRestoreEnabled_) {
233 $('old-startup-last-text').hidden = true; 233 $('old-startup-last-text').hidden = true;
234 $('new-startup-last-text').hidden = false; 234 $('new-startup-last-text').hidden = false;
235 } 235 }
236 }, 236 },
237 237
238 /** 238 /**
239 * Updates managed banner visibility state. This function iterates over
240 * all input fields of all subpages and if any of these is marked as managed
241 * it triggers the managed banner to be visible.
James Hawkins 2012/02/09 04:41:45 @private
242 */
243 updateManagedBannerVisibility_: function() {
244 var bannerDiv = $('managed-prefs-banner');
245
246 var controlledByPolicy = false;
247 var controlledByExtension = false;
248 var inputElements = document.querySelectorAll('input[controlled-by]');
249 var mainPages = document.querySelectorAll('#page-container .page');
250 for (var i = 0, len = inputElements.length; i < len; i++) {
251 if (inputElements[i].controlledBy == 'policy')
252 controlledByPolicy = true;
253 else if (inputElements[i].controlledBy == 'extension')
254 controlledByExtension = true;
255 }
256 if (!controlledByPolicy && !controlledByExtension) {
257 bannerDiv.classList.add('hidden');
258 for (var i = 0; i < mainPages.length; i++)
259 mainPages[i].classList.remove('under-managed-prefs-banner');
260 } else {
261 bannerDiv.classList.remove('hidden');
262 for (var i = 0; i < mainPages.length; i++)
263 mainPages[i].classList.add('under-managed-prefs-banner');
264
265 if (controlledByPolicy && !controlledByExtension) {
266 $('managed-prefs-text').textContent =
267 templateData.policyManagedPrefsBannerText;
268 } else if (!controlledByPolicy && controlledByExtension) {
269 $('managed-prefs-text').textContent =
270 templateData.extensionManagedPrefsBannerText;
271 } else if (controlledByPolicy && controlledByExtension) {
272 $('managed-prefs-text').textContent =
273 templateData.policyAndExtensionManagedPrefsBannerText;
274 }
275 }
276 },
277
278 /**
239 * Initializes a button for controlling screen brightness. 279 * Initializes a button for controlling screen brightness.
240 * @param {string} id Button ID. 280 * @param {string} id Button ID.
241 * @param {string} callback Name of the callback function. 281 * @param {string} callback Name of the callback function.
242 */ 282 */
243 initBrightnessButton_: function(id, callback) { 283 initBrightnessButton_: function(id, callback) {
244 var button = $(id); 284 var button = $(id);
245 cr.ui.decorate(button, RepeatingButton); 285 cr.ui.decorate(button, RepeatingButton);
246 button.repeatInterval = 300; 286 button.repeatInterval = 300;
247 button.addEventListener(RepeatingButton.Event.BUTTON_HELD, function(e) { 287 button.addEventListener(RepeatingButton.Event.BUTTON_HELD, function(e) {
248 chrome.send(callback); 288 chrome.send(callback);
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 'setSyncActionLinkEnabled', 655 'setSyncActionLinkEnabled',
616 'setSyncActionLinkLabel', 656 'setSyncActionLinkLabel',
617 'setSyncEnabled', 657 'setSyncEnabled',
618 'setSyncSetupCompleted', 658 'setSyncSetupCompleted',
619 'setSyncStatus', 659 'setSyncStatus',
620 'setSyncStatusErrorVisible', 660 'setSyncStatusErrorVisible',
621 'setThemesResetButtonEnabled', 661 'setThemesResetButtonEnabled',
622 'updateAccountPicture', 662 'updateAccountPicture',
623 'updateAutocompleteSuggestions', 663 'updateAutocompleteSuggestions',
624 'updateHomePageLabel', 664 'updateHomePageLabel',
665 'updateManagedBannerVisibility',
625 'updateSearchEngines', 666 'updateSearchEngines',
626 'updateStartupPages', 667 'updateStartupPages',
627 ].forEach(function(name) { 668 ].forEach(function(name) {
628 BrowserOptions[name] = function() { 669 BrowserOptions[name] = function() {
629 var instance = BrowserOptions.getInstance(); 670 var instance = BrowserOptions.getInstance();
630 return instance[name + '_'].apply(instance, arguments); 671 return instance[name + '_'].apply(instance, arguments);
631 }; 672 };
632 }); 673 });
633 674
634 BrowserOptions.updateDefaultBrowserState = function(statusString, isDefault, 675 BrowserOptions.updateDefaultBrowserState = function(statusString, isDefault,
(...skipping 15 matching lines...) Expand all
650 return BrowserOptions.getInstance().username_; 691 return BrowserOptions.getInstance().username_;
651 }; 692 };
652 } 693 }
653 694
654 // Export 695 // Export
655 return { 696 return {
656 BrowserOptions: BrowserOptions 697 BrowserOptions: BrowserOptions
657 }; 698 };
658 699
659 }); 700 });
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