diff options
author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 19:32:15 +0000 |
---|---|---|
committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 19:32:15 +0000 |
commit | 4ccc05e1856d25351903b8a1c30724c2db493573 (patch) | |
tree | d07125bb0a1816d88e2fc518c85d6e3b250dbb4c /chrome/browser/resources/options/personal_options.js | |
parent | 89587d8e7a6ce9032160f26877dcf41b322563be (diff) | |
download | chromium_src-4ccc05e1856d25351903b8a1c30724c2db493573.zip chromium_src-4ccc05e1856d25351903b8a1c30724c2db493573.tar.gz chromium_src-4ccc05e1856d25351903b8a1c30724c2db493573.tar.bz2 |
Add a pref checkbox to enable/disable screen lock for ChromeOs.
- Add an "Account" section to personal options page that has an account
picture and a checkbox to enable/disable screen lock;
- Add CrosPersonalOptionsHandler to serve the section;
- Add a kEnableScreenLock prefs;
- Add a EnableScreenLock method to PowerLibrary to update power manager config;
BUG=chromium-os:6546
TEST=This is chrome part change for chromium-os:6546. Verify that account picture shows up correctly and /var/lib/power_manager/lock_on_idle_suspend is updated correctly based on the prefs checkbox after login.
Review URL: http://codereview.chromium.org/3532010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/options/personal_options.js')
-rw-r--r-- | chrome/browser/resources/options/personal_options.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js index c0871ce..357f5af 100644 --- a/chrome/browser/resources/options/personal_options.js +++ b/chrome/browser/resources/options/personal_options.js @@ -94,6 +94,10 @@ cr.define('options', function() { chrome.send('themesGallery'); } } + + if (cr.isChromeOS) { + chrome.send('loadAccountPicture'); + } }, syncStatusCallback_: function(statusString) { @@ -148,6 +152,10 @@ cr.define('options', function() { PersonalOptions.getInstance().setClassicThemeButtonEnabled_(enabled); }; + PersonalOptions.setAccountPicture = function(image) { + $('account-picture').src = image; + } + // Export return { PersonalOptions: PersonalOptions |