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

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

Issue 11189088: Add controlled setting indicator for default search engine configuration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment addressed. Created 8 years, 2 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
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 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 * @param {Array} engines List of available search engines. 812 * @param {Array} engines List of available search engines.
813 * @param {number} defaultValue The value of the current default engine. 813 * @param {number} defaultValue The value of the current default engine.
814 * @param {boolean} defaultManaged Whether the default search provider is 814 * @param {boolean} defaultManaged Whether the default search provider is
815 * managed. If true, the default search provider can't be changed. 815 * managed. If true, the default search provider can't be changed.
816 * @private 816 * @private
817 */ 817 */
818 updateSearchEngines_: function(engines, defaultValue, defaultManaged) { 818 updateSearchEngines_: function(engines, defaultValue, defaultManaged) {
819 this.clearSearchEngines_(); 819 this.clearSearchEngines_();
820 engineSelect = $('default-search-engine'); 820 engineSelect = $('default-search-engine');
821 engineSelect.disabled = defaultManaged; 821 engineSelect.disabled = defaultManaged;
822 if (defaultManaged && defaultValue == -1)
823 return;
822 engineCount = engines.length; 824 engineCount = engines.length;
823 var defaultIndex = -1; 825 var defaultIndex = -1;
824 for (var i = 0; i < engineCount; i++) { 826 for (var i = 0; i < engineCount; i++) {
825 var engine = engines[i]; 827 var engine = engines[i];
826 var option = new Option(engine.name, engine.index); 828 var option = new Option(engine.name, engine.index);
827 if (defaultValue == option.value) 829 if (defaultValue == option.value)
828 defaultIndex = i; 830 defaultIndex = i;
829 engineSelect.appendChild(option); 831 engineSelect.appendChild(option);
830 } 832 }
831 if (defaultIndex >= 0) 833 if (defaultIndex >= 0)
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 BrowserOptions.getLoggedInUsername = function() { 1344 BrowserOptions.getLoggedInUsername = function() {
1343 return BrowserOptions.getInstance().username_; 1345 return BrowserOptions.getInstance().username_;
1344 }; 1346 };
1345 } 1347 }
1346 1348
1347 // Export 1349 // Export
1348 return { 1350 return {
1349 BrowserOptions: BrowserOptions 1351 BrowserOptions: BrowserOptions
1350 }; 1352 };
1351 }); 1353 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698