Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 $('gpu-mode-reset-restart').style.visibility = 'hidden'; | |
|
Dan Beam
2013/03/21 02:03:52
you should change this to .hidden = true;
Zhenyao Mo
2013/03/21 21:52:53
Done.
| |
| 473 $('gpu-mode-checkbox').onclick = function(event) { | |
|
Dan Beam
2013/03/21 02:03:52
it seems the code as it is now is slightly subopti
Zhenyao Mo
2013/03/21 21:52:53
This is more complicated. Because a user can modi
Dan Beam
2013/03/21 22:19:27
pref notifications should change the checkbox alre
| |
| 474 $('gpu-mode-reset-restart').style.visibility = 'visible'; | |
|
Dan Beam
2013/03/21 02:03:52
and .hidden = false; to avoid invisible text causi
Zhenyao Mo
2013/03/21 21:52:53
Done.
| |
| 475 }; | |
| 476 $('gpu-mode-reset-restart-link').onclick = function(event) { | |
|
Dan Beam
2013/03/21 02:03:52
event.preventDefault();
Zhenyao Mo
2013/03/21 21:52:53
Done.
| |
| 477 chrome.send('restartBrowser'); | |
| 478 }; | |
| 479 } | |
| 480 | |
| 470 if (loadTimeData.getBoolean('managedUsersEnabled') && | 481 if (loadTimeData.getBoolean('managedUsersEnabled') && |
| 471 loadTimeData.getBoolean('profileIsManaged')) { | 482 loadTimeData.getBoolean('profileIsManaged')) { |
| 472 $('managed-user-settings-section').hidden = false; | 483 $('managed-user-settings-section').hidden = false; |
| 473 | 484 |
| 474 $('open-managed-user-settings-button').onclick = function(event) { | 485 $('open-managed-user-settings-button').onclick = function(event) { |
| 475 OptionsPage.navigateToPage('managedUser'); | 486 OptionsPage.navigateToPage('managedUser'); |
| 476 }; | 487 }; |
| 477 } | 488 } |
| 478 }, | 489 }, |
| 479 | 490 |
| (...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1440 BrowserOptions.getLoggedInUsername = function() { | 1451 BrowserOptions.getLoggedInUsername = function() { |
| 1441 return BrowserOptions.getInstance().username_; | 1452 return BrowserOptions.getInstance().username_; |
| 1442 }; | 1453 }; |
| 1443 } | 1454 } |
| 1444 | 1455 |
| 1445 // Export | 1456 // Export |
| 1446 return { | 1457 return { |
| 1447 BrowserOptions: BrowserOptions | 1458 BrowserOptions: BrowserOptions |
| 1448 }; | 1459 }; |
| 1449 }); | 1460 }); |
| OLD | NEW |