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

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

Issue 24930003: Migrate startup URLs pref. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 }; 96 };
97 97
98 // Internet connection section (ChromeOS only). 98 // Internet connection section (ChromeOS only).
99 if (cr.isChromeOS) { 99 if (cr.isChromeOS) {
100 options.network.NetworkList.decorate($('network-list')); 100 options.network.NetworkList.decorate($('network-list'));
101 options.network.NetworkList.refreshNetworkData( 101 options.network.NetworkList.refreshNetworkData(
102 loadTimeData.getValue('networkData')); 102 loadTimeData.getValue('networkData'));
103 } 103 }
104 104
105 // On Startup section. 105 // On Startup section.
106 Preferences.getInstance().addEventListener('session.restore_on_startup', 106 Preferences.getInstance().addEventListener('session.startup_urls',
MAD 2013/10/15 14:31:16 This is not the same pref as urls_to_restore_on_st
robertshield 2013/10/15 18:00:44 Thanks, good catch.
107 this.onRestoreOnStartupChanged_.bind(this)); 107 this.onRestoreOnStartupChanged_.bind(this));
108 Preferences.getInstance().addEventListener( 108 Preferences.getInstance().addEventListener(
109 'session.urls_to_restore_on_startup', 109 'session.startup_urls',
110 function(event) { 110 function(event) {
111 $('startup-set-pages').disabled = event.value.disabled; 111 $('startup-set-pages').disabled = event.value.disabled;
112 }); 112 });
113 113
114 $('startup-set-pages').onclick = function() { 114 $('startup-set-pages').onclick = function() {
115 OptionsPage.navigateToPage('startup'); 115 OptionsPage.navigateToPage('startup');
116 }; 116 };
117 117
118 // Appearance section. 118 // Appearance section.
119 Preferences.getInstance().addEventListener('browser.show_home_button', 119 Preferences.getInstance().addEventListener('browser.show_home_button',
(...skipping 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 BrowserOptions.getLoggedInUsername = function() { 1537 BrowserOptions.getLoggedInUsername = function() {
1538 return BrowserOptions.getInstance().username_; 1538 return BrowserOptions.getInstance().username_;
1539 }; 1539 };
1540 } 1540 }
1541 1541
1542 // Export 1542 // Export
1543 return { 1543 return {
1544 BrowserOptions: BrowserOptions 1544 BrowserOptions: BrowserOptions
1545 }; 1545 };
1546 }); 1546 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698