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

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

Issue 6174009: Tidy up <select>s in tabbed options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 ListSelectionModel = cr.ui.ListSelectionModel; 8 const ListSelectionModel = cr.ui.ListSelectionModel;
9 9
10 // 10 //
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 $('instantEnableCheckbox').onclick = function(event) { 55 $('instantEnableCheckbox').onclick = function(event) {
56 var alreadyConfirmed = $('instantDialogShown').checked; 56 var alreadyConfirmed = $('instantDialogShown').checked;
57 57
58 if (this.checked && !alreadyConfirmed) { 58 if (this.checked && !alreadyConfirmed) {
59 // Leave disabled for now. The PrefCheckbox handler already set it to 59 // Leave disabled for now. The PrefCheckbox handler already set it to
60 // true so undo that. 60 // true so undo that.
61 Preferences.setBooleanPref(this.pref, false, this.metric); 61 Preferences.setBooleanPref(this.pref, false, this.metric);
62 OptionsPage.showOverlay('instantConfirmOverlay'); 62 OptionsPage.showOverlay('instantConfirmOverlay');
63 } 63 }
64 }; 64 };
65 $('defaultSearchEngine').onchange = function(event) {
66 var engineSelect = $('defaultSearchEngine');
67 var selectedIndex = engineSelect.selectedIndex;
68 if (selectedIndex >= 0) {
69 var selection = engineSelect.options[selectedIndex];
70 chrome.send('setDefaultSearchEngine', [String(selection.value)]);
71 }
72 };
65 73
66 var homepageField = $('homepageURL'); 74 var homepageField = $('homepageURL');
67 $('homepageUseNTPButton').onchange = 75 $('homepageUseNTPButton').onchange =
68 this.handleHomepageUseNTPButtonChange_.bind(this); 76 this.handleHomepageUseNTPButtonChange_.bind(this);
69 $('homepageUseURLButton').onchange = 77 $('homepageUseURLButton').onchange =
70 this.handleHomepageUseURLButtonChange_.bind(this); 78 this.handleHomepageUseURLButtonChange_.bind(this);
71 homepageField.onchange = 79 homepageField.onchange =
72 this.handleHomepageURLChange_.bind(this); 80 this.handleHomepageURLChange_.bind(this);
73 81
74 // Ensure that changes are committed when closing the page. 82 // Ensure that changes are committed when closing the page.
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 updateCustomStartupPageControlStates_: function() { 351 updateCustomStartupPageControlStates_: function() {
344 var disable = !this.shouldEnableCustomStartupPageControls_(); 352 var disable = !this.shouldEnableCustomStartupPageControls_();
345 $('startupPagesShortList').disabled = disable; 353 $('startupPagesShortList').disabled = disable;
346 $('startupUseCurrentButton').disabled = disable; 354 $('startupUseCurrentButton').disabled = disable;
347 $('startupPageManagerButton').disabled = disable; 355 $('startupPageManagerButton').disabled = disable;
348 }, 356 },
349 357
350 /** 358 /**
351 * Set the default search engine based on the popup selection. 359 * Set the default search engine based on the popup selection.
352 */ 360 */
353 setDefaultSearchEngine: function() { 361 setDefaultSearchEngine: function() {
stuartmorgan 2011/01/12 22:59:41 Why is this still here? Or, alternately, why is i
Evan Stade 2011/01/12 23:19:20 well, it's not supposed to be... i will remove the
stuartmorgan 2011/01/12 23:30:09 Well, I wouldn't have made the other non-trivial f
354 var engineSelect = $('defaultSearchEngine');
355 var selectedIndex = engineSelect.selectedIndex;
356 if (selectedIndex >= 0) {
357 var selection = engineSelect.options[selectedIndex];
358 chrome.send('setDefaultSearchEngine', [String(selection.value)]);
359 }
360 }, 362 },
361 }; 363 };
362 364
363 BrowserOptions.updateDefaultBrowserState = function(statusString, isDefault, 365 BrowserOptions.updateDefaultBrowserState = function(statusString, isDefault,
364 canBeDefault) { 366 canBeDefault) {
365 if (!cr.isChromeOS) { 367 if (!cr.isChromeOS) {
366 BrowserOptions.getInstance().updateDefaultBrowserState_(statusString, 368 BrowserOptions.getInstance().updateDefaultBrowserState_(statusString,
367 isDefault, 369 isDefault,
368 canBeDefault); 370 canBeDefault);
369 } 371 }
370 }; 372 };
371 373
372 BrowserOptions.updateSearchEngines = function(engines, defaultValue) { 374 BrowserOptions.updateSearchEngines = function(engines, defaultValue) {
373 BrowserOptions.getInstance().updateSearchEngines_(engines, defaultValue); 375 BrowserOptions.getInstance().updateSearchEngines_(engines, defaultValue);
374 }; 376 };
375 377
376 BrowserOptions.updateStartupPages = function(pages) { 378 BrowserOptions.updateStartupPages = function(pages) {
377 BrowserOptions.getInstance().updateStartupPages_(pages); 379 BrowserOptions.getInstance().updateStartupPages_(pages);
378 StartupPageManager.getInstance().updateStartupPages_(pages); 380 StartupPageManager.getInstance().updateStartupPages_(pages);
379 }; 381 };
380 382
381 // Export 383 // Export
382 return { 384 return {
383 BrowserOptions: BrowserOptions 385 BrowserOptions: BrowserOptions
384 }; 386 };
385 387
386 }); 388 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698