chrome/browser/extensions/extension_host.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/extensions/extension_host.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/browser/extensions/extension_host.cc

diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc

index e7562fc700b2e3aec5d5ac7dc9c2b3322e1f5673..d09b41f041395eece7937ecc46da26090c7ea100 100644

--- a/chrome/browser/extensions/extension_host.cc

+++ b/chrome/browser/extensions/extension_host.cc

@@ -49,6 +49,7 @@

#include "ui/base/keycodes/keyboard_codes.h"

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

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

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

#if defined(TOOLKIT_VIEWS)

#include "ui/views/widget/widget.h"

@@ -321,7 +322,7 @@ void ExtensionHost::InsertInfobarCSS() {

static const base::StringPiece css(

ResourceBundle::GetSharedInstance().GetRawDataResource(

- IDR_EXTENSIONS_INFOBAR_CSS));

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

render_view_host()->InsertCSS(string16(), css.as_string());

}