chrome/browser/extensions/extension_host.cc - Issue 10412004: Revert "Revert 137734 - 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 10412004: Revert "Revert 137734 - 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:

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

Download patch

Index: chrome/browser/extensions/extension_host.cc

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

index 1c0fdb3f4098d1d5ed25301441d703e1412aaa88..f72fbcedf017fec80ea738f429393547eb3d800f 100644

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

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

@@ -50,6 +50,7 @@

#include "grit/generated_resources.h"

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

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

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

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

#if defined(TOOLKIT_VIEWS)

@@ -330,7 +331,7 @@ void ExtensionHost::InsertInfobarCSS() {

static const base::StringPiece css(

ResourceBundle::GetSharedInstance().GetRawDataResource(

- IDR_EXTENSIONS_INFOBAR_CSS));

+ IDR_EXTENSIONS_INFOBAR_CSS, ui::SCALE_FACTOR_NONE));

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

}

« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/extensions/extension_protocols.cc » ('j') | no next file with comments »