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

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

Issue 7522025: Turn on session restore by default for mac on Lion (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: JS nits and comment correction Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 8
9 // 9 //
10 // BrowserOptions class 10 // BrowserOptions class
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 // Call base class implementation to start preference initialization. 56 // Call base class implementation to start preference initialization.
57 OptionsPage.prototype.initializePage.call(this); 57 OptionsPage.prototype.initializePage.call(this);
58 58
59 // Wire up controls. 59 // Wire up controls.
60 $('startupUseCurrentButton').onclick = function(event) { 60 $('startupUseCurrentButton').onclick = function(event) {
61 chrome.send('setStartupPagesToCurrentPages'); 61 chrome.send('setStartupPagesToCurrentPages');
62 }; 62 };
63 $('toolbarShowBookmarksBar').onchange = function() { 63 $('toolbarShowBookmarksBar').onchange = function() {
64 chrome.send('toggleShowBookmarksBar'); 64 chrome.send('toggleShowBookmarksBar');
65 }; 65 };
66 var items = document.querySelectorAll('input[name=startup]');
67 for (i = 0; i < items.length; i++) {
68 items[i].onchange = function(event) {
69 chrome.send('setRestoreOnStartup', [event.target.value]);
70 chrome.send('coreOptionsUserMetricsAction',
71 [event.target.getAttribute('metric')]);
72 };
73 }
66 $('defaultSearchManageEnginesButton').onclick = function(event) { 74 $('defaultSearchManageEnginesButton').onclick = function(event) {
67 OptionsPage.navigateToPage('searchEngines'); 75 OptionsPage.navigateToPage('searchEngines');
68 chrome.send('coreOptionsUserMetricsAction', 76 chrome.send('coreOptionsUserMetricsAction',
69 ['Options_ManageSearchEngines']); 77 ['Options_ManageSearchEngines']);
70 }; 78 };
71 $('defaultSearchEngine').onchange = this.setDefaultSearchEngine_; 79 $('defaultSearchEngine').onchange = this.setDefaultSearchEngine_;
72 80
73 var self = this; 81 var self = this;
74 $('instantEnabledCheckbox').customChangeHandler = function(event) { 82 $('instantEnabledCheckbox').customChangeHandler = function(event) {
75 if (this.checked) { 83 if (this.checked) {
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 * be enabled. 259 * be enabled.
252 * @returns {boolean} Whether the startup page controls should be 260 * @returns {boolean} Whether the startup page controls should be
253 * enabled. 261 * enabled.
254 */ 262 */
255 shouldEnableCustomStartupPageControls: function(pages) { 263 shouldEnableCustomStartupPageControls: function(pages) {
256 return $('startupShowPagesButton').checked && 264 return $('startupShowPagesButton').checked &&
257 !this.startup_pages_pref_.controlledBy; 265 !this.startup_pages_pref_.controlledBy;
258 }, 266 },
259 267
260 /** 268 /**
269 * Updates the startup radio group with the given value.
270 * @param {number} value the preference value being set.
271 * @private
272 */
273 updateRestoreOnStartup_: function(value) {
274 var items = document.querySelectorAll('input[name=startup]');
275 for (i = 0; i < items.length; i++) {
276 if (items[i].value == value)
277 items[i].checked = true;
278 }
279 },
280
281 /**
261 * Updates the startup pages list with the given entries. 282 * Updates the startup pages list with the given entries.
262 * @param {Array} pages List of startup pages. 283 * @param {Array} pages List of startup pages.
263 * @private 284 * @private
264 */ 285 */
265 updateStartupPages_: function(pages) { 286 updateStartupPages_: function(pages) {
266 var model = new ArrayDataModel(pages); 287 var model = new ArrayDataModel(pages);
267 // Add a "new page" row. 288 // Add a "new page" row.
268 model.push({ 289 model.push({
269 'modelIndex': '-1' 290 'modelIndex': '-1'
270 }); 291 });
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 canBeDefault); 524 canBeDefault);
504 } 525 }
505 }; 526 };
506 527
507 BrowserOptions.updateSearchEngines = function(engines, defaultValue, 528 BrowserOptions.updateSearchEngines = function(engines, defaultValue,
508 defaultManaged) { 529 defaultManaged) {
509 BrowserOptions.getInstance().updateSearchEngines_(engines, defaultValue, 530 BrowserOptions.getInstance().updateSearchEngines_(engines, defaultValue,
510 defaultManaged); 531 defaultManaged);
511 }; 532 };
512 533
534 BrowserOptions.updateRestoreOnStartup = function(value) {
535 BrowserOptions.getInstance().updateRestoreOnStartup_(value);
536 };
537
513 BrowserOptions.updateStartupPages = function(pages) { 538 BrowserOptions.updateStartupPages = function(pages) {
514 BrowserOptions.getInstance().updateStartupPages_(pages); 539 BrowserOptions.getInstance().updateStartupPages_(pages);
515 }; 540 };
516 541
517 BrowserOptions.updateAutocompleteSuggestions = function(suggestions) { 542 BrowserOptions.updateAutocompleteSuggestions = function(suggestions) {
518 BrowserOptions.getInstance().updateAutocompleteSuggestions_(suggestions); 543 BrowserOptions.getInstance().updateAutocompleteSuggestions_(suggestions);
519 }; 544 };
520 545
521 BrowserOptions.setInstantFieldTrialStatus = function(enabled) { 546 BrowserOptions.setInstantFieldTrialStatus = function(enabled) {
522 BrowserOptions.getInstance().setInstantFieldTrialStatus_(enabled); 547 BrowserOptions.getInstance().setInstantFieldTrialStatus_(enabled);
523 }; 548 };
524 549
525 // Export 550 // Export
526 return { 551 return {
527 BrowserOptions: BrowserOptions 552 BrowserOptions: BrowserOptions
528 }; 553 };
529 554
530 }); 555 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698