summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 23:46:06 +0000
committerivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-02 23:46:06 +0000
commitd05e77518b82c99dd95211b57a5adab352c31f00 (patch)
tree9732feb53bc207ec1665c1f9fde3bdd402d50433 /chrome/browser/automation
parent3f343425187a3065c268e575002584c859d36641 (diff)
downloadchromium_src-d05e77518b82c99dd95211b57a5adab352c31f00.zip
chromium_src-d05e77518b82c99dd95211b57a5adab352c31f00.tar.gz
chromium_src-d05e77518b82c99dd95211b57a5adab352c31f00.tar.bz2
[cros] Encode user images when set from WebUI (regression fix).
This only fixes the avatar-related part of the bug. UserImageLoader now always passes raw data to the callback. BUG=139887 Review URL: https://chromiumcodereview.appspot.com/10830111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider_observers_chromeos.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/automation/automation_provider_observers_chromeos.cc b/chrome/browser/automation/automation_provider_observers_chromeos.cc
index 9da0036..e80d839 100644
--- a/chrome/browser/automation/automation_provider_observers_chromeos.cc
+++ b/chrome/browser/automation/automation_provider_observers_chromeos.cc
@@ -518,7 +518,8 @@ void PhotoCaptureObserver::OnCapturingStopped(
// Set up an observer for UserManager (it will delete itself).
user_manager->AddObserver(this);
- user_manager->SaveUserImage(user.email(), chromeos::UserImage(photo));
+ user_manager->SaveUserImage(
+ user.email(), chromeos::UserImage::CreateAndEncode(photo));
}
void PhotoCaptureObserver::LocalStateChanged(