diff options
author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 17:55:37 +0000 |
---|---|---|
committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 17:55:37 +0000 |
commit | e98fec04a248a8f952ca86d9a6bd9fc4a619e7e1 (patch) | |
tree | 8154149c3c81c9dbd27d5d769967871c300118f7 /chrome/browser/chromeos | |
parent | 497606bc48a31173166147910fdd225533aeca60 (diff) | |
download | chromium_src-e98fec04a248a8f952ca86d9a6bd9fc4a619e7e1.zip chromium_src-e98fec04a248a8f952ca86d9a6bd9fc4a619e7e1.tar.gz chromium_src-e98fec04a248a8f952ca86d9a6bd9fc4a619e7e1.tar.bz2 |
Show user pictures in whitelist if they have logged into the machine before.
BUG=none.
TEST=Verify user picture shows up in the white list.
Review URL: http://codereview.chromium.org/3676003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r-- | chrome/browser/chromeos/dom_ui/accounts_options_handler.cc | 21 | ||||
-rw-r--r-- | chrome/browser/chromeos/dom_ui/accounts_options_handler.h | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc index 249419a..0176d7e 100644 --- a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc @@ -11,6 +11,7 @@ #include "base/values.h" #include "chrome/browser/chromeos/cros_settings_provider_user.h" #include "chrome/browser/chromeos/login/user_manager.h" +#include "chrome/browser/dom_ui/dom_ui_util.h" #include "grit/generated_resources.h" namespace chromeos { @@ -28,6 +29,8 @@ void AccountsOptionsHandler::RegisterMessages() { NewCallback(this, &AccountsOptionsHandler::WhitelistUser)); dom_ui_->RegisterMessageCallback("unwhitelistUser", NewCallback(this, &AccountsOptionsHandler::UnwhitelistUser)); + dom_ui_->RegisterMessageCallback("fetchUserPictures", + NewCallback(this, &AccountsOptionsHandler::FetchUserPictures)); } void AccountsOptionsHandler::GetLocalizedValues( @@ -76,4 +79,22 @@ void AccountsOptionsHandler::UnwhitelistUser(const ListValue* args) { users_settings()->UnwhitelistUser(email); } +void AccountsOptionsHandler::FetchUserPictures(const ListValue* args) { + DictionaryValue user_pictures; + + std::vector<UserManager::User> users = UserManager::Get()->GetUsers(); + for (std::vector<UserManager::User>::const_iterator it = users.begin(); + it < users.end(); ++it) { + if (!it->image().isNull()) { + StringValue* picture = new StringValue( + dom_ui_util::GetImageDataUrl(it->image())); + // SetWithoutPathExpansion because email has "." in it. + user_pictures.SetWithoutPathExpansion(it->email(), picture); + } + } + + dom_ui_->CallJavascriptFunction(L"AccountsOptions.setUserPictures", + user_pictures); +} + } // namespace chromeos diff --git a/chrome/browser/chromeos/dom_ui/accounts_options_handler.h b/chrome/browser/chromeos/dom_ui/accounts_options_handler.h index a43ec50..177b447 100644 --- a/chrome/browser/chromeos/dom_ui/accounts_options_handler.h +++ b/chrome/browser/chromeos/dom_ui/accounts_options_handler.h @@ -31,6 +31,9 @@ class AccountsOptionsHandler : public CrosOptionsPageUIHandler { void WhitelistUser(const ListValue* args); void UnwhitelistUser(const ListValue* args); + // Javascript callback to fetch known user pictures. + void FetchUserPictures(const ListValue* args); + DISALLOW_COPY_AND_ASSIGN(AccountsOptionsHandler); }; |