chrome/browser/ui/webui/conflicts_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/conflicts_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: 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/browser/ui/webui/conflicts_ui.cc

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

index 75c181604cc7e1657bd5f1e8864679a190de665d..d5e8ed9322fd9e6fc8313298020888bfc314a7e5 100644

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

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

@@ -33,6 +33,7 @@

#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"

using content::UserMetricsAction;

@@ -174,7 +175,7 @@ ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {

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

return static_cast<base::RefCountedMemory*>(

ResourceBundle::GetSharedInstance().LoadDataResourceBytes(

- IDR_CONFLICT_FAVICON));

+ IDR_CONFLICT_FAVICON, ui::SCALE_FACTOR_NONE));

}

#endif