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

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

Issue 12929018: Enhancements to https://codereview.chromium.org/12494033/ for zmo@ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 24 matching lines...) Expand all
35 * |onShowHomeButtonChanged_|. 35 * |onShowHomeButtonChanged_|.
36 * @type {boolean} 36 * @type {boolean}
37 * @private 37 * @private
38 */ 38 */
39 onShowHomeButtonChangedCalled_: false, 39 onShowHomeButtonChangedCalled_: false,
40 40
41 /** 41 /**
42 * Track if page initialization is complete. All C++ UI handlers have the 42 * Track if page initialization is complete. All C++ UI handlers have the
43 * chance to manipulate page content within their InitializePage methods. 43 * chance to manipulate page content within their InitializePage methods.
44 * This flag is set to true after all initializers have been called. 44 * This flag is set to true after all initializers have been called.
45 * @type (boolean} 45 * @type {boolean}
46 * @private 46 * @private
47 */ 47 */
48 initializationComplete_: false, 48 initializationComplete_: false,
49 49
50 /** @override */ 50 /** @override */
51 initializePage: function() { 51 initializePage: function() {
52 OptionsPage.prototype.initializePage.call(this); 52 OptionsPage.prototype.initializePage.call(this);
53 var self = this; 53 var self = this;
54 54
55 // Ensure that navigation events are unblocked on uber page. A reload of 55 // Ensure that navigation events are unblocked on uber page. A reload of
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 if (cr.isChromeOS) { 460 if (cr.isChromeOS) {
461 if (loadTimeData.getBoolean('enableKioskSection')) { 461 if (loadTimeData.getBoolean('enableKioskSection')) {
462 $('kiosk-section').hidden = false; 462 $('kiosk-section').hidden = false;
463 463
464 $('manage-kiosk-apps-button').onclick = function(event) { 464 $('manage-kiosk-apps-button').onclick = function(event) {
465 OptionsPage.navigateToPage('kioskAppsOverlay'); 465 OptionsPage.navigateToPage('kioskAppsOverlay');
466 }; 466 };
467 } 467 }
468 } 468 }
469 469
470 // System section.
471 if (!cr.isChromeOS) {
472 var updateGpuRestartLink = function() {
473 $('gpu-mode-reset-restart').hidden =
474 loadTimeData.getBoolean('gpuModeAtStart') ==
475 $('gpu-mode-checkbox').checked;
476 };
477 $('gpu-mode-checkbox').onchange = updateGpuRestartLink;
arv (Not doing code reviews) 2013/03/22 14:35:48 Do you really want to listen to the user changing
Dan Beam 2013/03/22 19:24:31 zmo@: yeah, you could do this instead
478 $('gpu-mode-reset-restart-link').onclick = function(event) {
479 event.preventDefault();
arv (Not doing code reviews) 2013/03/22 14:35:48 Change to <button> and no need for preventDefault.
Dan Beam 2013/03/22 19:24:31 That would be a little bit awkward where it curren
arv (Not doing code reviews) 2013/03/22 19:35:02 We have a class called link-button which styles th
480 chrome.send('restartBrowser');
481 };
482 updateGpuRestartLink();
Dan Beam 2013/03/22 00:32:56 ^ zmo@: you should set this on page load as well
483 }
484
470 if (loadTimeData.getBoolean('managedUsersEnabled') && 485 if (loadTimeData.getBoolean('managedUsersEnabled') &&
471 loadTimeData.getBoolean('profileIsManaged')) { 486 loadTimeData.getBoolean('profileIsManaged')) {
472 $('managed-user-settings-section').hidden = false; 487 $('managed-user-settings-section').hidden = false;
473 488
474 $('open-managed-user-settings-button').onclick = function(event) { 489 $('open-managed-user-settings-button').onclick = function(event) {
475 OptionsPage.navigateToPage('managedUser'); 490 OptionsPage.navigateToPage('managedUser');
476 }; 491 };
477 } 492 }
478 }, 493 },
479 494
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 BrowserOptions.getLoggedInUsername = function() { 1455 BrowserOptions.getLoggedInUsername = function() {
1441 return BrowserOptions.getInstance().username_; 1456 return BrowserOptions.getInstance().username_;
1442 }; 1457 };
1443 } 1458 }
1444 1459
1445 // Export 1460 // Export
1446 return { 1461 return {
1447 BrowserOptions: BrowserOptions 1462 BrowserOptions: BrowserOptions
1448 }; 1463 };
1449 }); 1464 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698