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

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: 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++) {
Robert Sesek 2011/07/28 18:30:22 nit: spaces around operators
dhollowa 2011/07/28 20:05:35 Done.
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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 * be enabled. 230 * be enabled.
223 * @returns {boolean} Whether the startup page controls should be 231 * @returns {boolean} Whether the startup page controls should be
224 * enabled. 232 * enabled.
225 */ 233 */
226 shouldEnableCustomStartupPageControls: function(pages) { 234 shouldEnableCustomStartupPageControls: function(pages) {
227 return $('startupShowPagesButton').checked && 235 return $('startupShowPagesButton').checked &&
228 !this.startup_pages_pref_.controlledBy; 236 !this.startup_pages_pref_.controlledBy;
229 }, 237 },
230 238
231 /** 239 /**
240 * Updates the startup radio group with the given value.
241 * @param {number} value the preference value being set.
242 * @private
243 */
244 updateRestoreOnStartup_: function(value) {
245 var items = document.querySelectorAll('input[name=startup]')
246 for (i=0; i < items.length; i++) {
247 if (items[i].value == value)
248 items[i].checked = true
Robert Sesek 2011/07/28 18:30:22 nit: missing semicolon
dhollowa 2011/07/28 20:05:35 Done.
249 }
250 },
251
252 /**
232 * Updates the startup pages list with the given entries. 253 * Updates the startup pages list with the given entries.
233 * @param {Array} pages List of startup pages. 254 * @param {Array} pages List of startup pages.
234 * @private 255 * @private
235 */ 256 */
236 updateStartupPages_: function(pages) { 257 updateStartupPages_: function(pages) {
237 var model = new ArrayDataModel(pages); 258 var model = new ArrayDataModel(pages);
238 // Add a "new page" row. 259 // Add a "new page" row.
239 model.push({ 260 model.push({
240 'modelIndex': '-1' 261 'modelIndex': '-1'
241 }); 262 });
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 canBeDefault); 495 canBeDefault);
475 } 496 }
476 }; 497 };
477 498
478 BrowserOptions.updateSearchEngines = function(engines, defaultValue, 499 BrowserOptions.updateSearchEngines = function(engines, defaultValue,
479 defaultManaged) { 500 defaultManaged) {
480 BrowserOptions.getInstance().updateSearchEngines_(engines, defaultValue, 501 BrowserOptions.getInstance().updateSearchEngines_(engines, defaultValue,
481 defaultManaged); 502 defaultManaged);
482 }; 503 };
483 504
505 BrowserOptions.updateRestoreOnStartup = function(value) {
506 BrowserOptions.getInstance().updateRestoreOnStartup_(value);
507 };
508
484 BrowserOptions.updateStartupPages = function(pages) { 509 BrowserOptions.updateStartupPages = function(pages) {
485 BrowserOptions.getInstance().updateStartupPages_(pages); 510 BrowserOptions.getInstance().updateStartupPages_(pages);
486 }; 511 };
487 512
488 BrowserOptions.updateAutocompleteSuggestions = function(suggestions) { 513 BrowserOptions.updateAutocompleteSuggestions = function(suggestions) {
489 BrowserOptions.getInstance().updateAutocompleteSuggestions_(suggestions); 514 BrowserOptions.getInstance().updateAutocompleteSuggestions_(suggestions);
490 }; 515 };
491 516
492 // Export 517 // Export
493 return { 518 return {
494 BrowserOptions: BrowserOptions 519 BrowserOptions: BrowserOptions
495 }; 520 };
496 521
497 }); 522 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698