chrome/browser/ui/webui/flags_ui.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/ui/webui/flags_ui.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/ui/webui/flags_ui.cc

diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc

index 0e5c34969419f81e6f6efe471900e121915f2bc9..8dea7e5ff8bda837b4a786fcacc05a5ab59cd6a3 100644

--- a/chrome/browser/ui/webui/flags_ui.cc

+++ b/chrome/browser/ui/webui/flags_ui.cc

@@ -26,9 +26,10 @@

#include "grit/browser_resources.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

-#include "grit/theme_resources_standard.h"

#include "grit/theme_resources.h"

+#include "grit/theme_resources_standard.h"

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

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

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

#if defined(OS_CHROMEOS)

@@ -169,7 +170,7 @@ FlagsUI::FlagsUI(content::WebUI* web_ui) : WebUIController(web_ui) {

// static

base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {

return ResourceBundle::GetSharedInstance().

- LoadDataResourceBytes(IDR_FLAGS);

+ LoadDataResourceBytes(IDR_FLAGS, ui::SCALE_FACTOR_100P);

}

// static

« no previous file with comments | « chrome/browser/ui/webui/favicon_source.cc ('k') | chrome/browser/ui/webui/history_ui.cc » ('j') | no next file with comments »