trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc - Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

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: trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 3 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: trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc

===================================================================

--- trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc (revision 224497)

+++ trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc (working copy)

@@ -370,7 +370,7 @@

sequence_token_));

std::string file_name = GURL(url_).ExtractFileName();

if (SaveData(chrome::DIR_CHROMEOS_WALLPAPERS, file_name, image_data_)) {

- wallpaper_.EnsureRepsForSupportedScales();

+ wallpaper_.EnsureRepsForSupportedScaleFactors();

scoped_ptr<gfx::ImageSkia> deep_copy(wallpaper_.DeepCopy());

// ImageSkia is not RefCountedThreadSafe. Use a deep copied ImageSkia if

// post to another thread.

@@ -502,7 +502,7 @@

unsafe_wallpaper_decoder_ = NULL;

if (generate_thumbnail_) {

- wallpaper.EnsureRepsForSupportedScales();

+ wallpaper.EnsureRepsForSupportedScaleFactors();

scoped_ptr<gfx::ImageSkia> deep_copy(wallpaper.DeepCopy());

// Generates thumbnail before call api function callback. We can then

// request thumbnail in the javascript callback.