chrome/common/extensions/api/extension_api.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/extensions/api/extension_api.cc

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

Patch Set: Merge with master. 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/extensions/api/extension_api.cc

diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc

index b713a2735f8d1d7ddcf945c8a45f7063d241a7d9..16458f8d9d48e44db4be3afd0cafdfb9a8587933 100644

--- a/chrome/common/extensions/api/extension_api.cc

+++ b/chrome/common/extensions/api/extension_api.cc

@@ -23,6 +23,7 @@

#include "googleurl/src/gurl.h"

#include "grit/common_resources.h"

#include "grit/extensions_api_resources.h"

+#include "ui/base/layout.h"

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

using base::DictionaryValue;

@@ -61,7 +62,8 @@ bool HasUnprivilegedChild(const DictionaryValue* name_space_node,

}

base::StringPiece ReadFromResource(int resource_id) {

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

+ return ResourceBundle::GetSharedInstance().GetRawDataResource(

+ resource_id, ui::SCALE_FACTOR_NONE);

}

scoped_ptr<ListValue> LoadSchemaList(const std::string& name,