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

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

index 5c6adce921c49ea5b42bc53456abbd809e613aa6..f4166a98085c8e144e56d24ffdd61e0284303bd7 100644

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

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

@@ -46,6 +46,7 @@

#include "net/base/escape.h"

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

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

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

using content::UserMetricsAction;

using content::WebContents;

@@ -485,5 +486,6 @@ const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {

// static

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

return ResourceBundle::GetSharedInstance().

- LoadDataResourceBytes(IDR_HISTORY_FAVICON);

+ LoadDataResourceBytes(IDR_HISTORY_FAVICON,

+ ui::ResourceHandle::kScaleFactor100x);

}