chrome/common/chrome_content_client.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/common/chrome_content_client.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:

Index: chrome/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index 6116c0856c8dca7b3a91f3dea45b18b405616f26..4922be7cd278bd3c9e9ff5c0052f08252f7ca9e1 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -26,6 +26,7 @@

#include "remoting/client/plugin/pepper_entrypoints.h"

#include "ui/base/l10n/l10n_util.h"

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

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

#include "webkit/glue/user_agent.h"

#include "webkit/plugins/npapi/plugin_list.h"

#include "webkit/plugins/plugin_constants.h"

@@ -416,7 +417,8 @@ string16 ChromeContentClient::GetLocalizedString(int message_id) const {

}

base::StringPiece ChromeContentClient::GetDataResource(int resource_id) const {

- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);

+ return ResourceBundle::GetSharedInstance().GetRawDataResource(

+ resource_id, ui::ResourceHandle::kScaleFactorNone);

}

#if defined(OS_WIN)