chrome/browser/ui/webui/options2/chromeos/user_image_source.cc - Issue 10830111: [cros] Encode user images when set from WebUI (regression fix).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options2/chromeos/user_image_source.cc

Issue 10830111: [cros] Encode user images when set from WebUI (regression fix). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review fixes Created 8 years, 5 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:

Index: chrome/browser/ui/webui/options2/chromeos/user_image_source.cc

diff --git a/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc

index 01f0efebbf44b50a144d07128f20572e292b06cf..57f4438b5f35fc7e4f374d5746e5b09910c5a278 100644

--- a/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc

+++ b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc

@@ -73,7 +73,7 @@ base::RefCountedMemory* UserImageSource::GetUserImage(

return new base::RefCountedBytes(user->animated_image());

} else if (user->has_raw_image()) {

return new base::RefCountedBytes(user->raw_image());

- } else if (user->has_default_image()) {

+ } else if (user->HasDefaultImage()) {

return ResourceBundle::GetSharedInstance().

LoadDataResourceBytes(kDefaultImageResources[user->image_index()],

scale_factor);