chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc - Issue 10387010: Select theme resources from ResourceBundle at requested scale factor.

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/wallpaper_thumbnail_source2.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Convert ptr to bool for win compile. Created 8 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/offline/offline_load_page.cc ('K') | « chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc ('k') | chrome/browser/ui/webui/options2/options_ui2.cc » ('j') | ui/base/resource/data_pack.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8186da8b2289512dca0210c72cb4a04f6da38249..384658c17b336ad29c3091c185ee1d7dac4ba0a3 100644

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

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

@@ -19,6 +19,7 @@

#include "grit/ui_resources.h"

#include "net/base/mime_util.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/base/resource/resource_handle.h"

#include "ui/gfx/codec/png_codec.h"

namespace chromeos {

@@ -82,7 +83,8 @@ void WallpaperThumbnailSource::StartDataRequest(const std::string& path,

if (idr != -1) {

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));

const ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- SendResponse(request_id, rb.LoadDataResourceBytes(idr));

+ SendResponse(request_id, rb.LoadDataResourceBytes(idr,

+ ui::ResourceHandle::kScaleFactor100x));

}