ui/base/resource/resource_bundle.cc - Issue 22418003: CHR-458: Remove DCHECK which prevents from using custom ResourceBundle::Delegate

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: ui/base/resource/resource_bundle.cc

Issue 22418003: CHR-458: Remove DCHECK which prevents from using custom ResourceBundle::Delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: A fixup based on review comments. Created 7 years, 4 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: ui/base/resource/resource_bundle.cc

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc

index 70623c29bc2662f9c4663ea6acce90d7084c4937..893d5f43198e6a56ef704965815df9ad3865a8d3 100644

--- a/ui/base/resource/resource_bundle.cc

+++ b/ui/base/resource/resource_bundle.cc

@@ -321,7 +321,7 @@ gfx::Image& ResourceBundle::GetImageNamed(int resource_id) {

image = delegate_->GetImageNamed(resource_id);

if (image.IsEmpty()) {

- DCHECK(!delegate_ && !data_packs_.empty()) <<

+ DCHECK(!data_packs_.empty()) <<

"Missing call to SetResourcesDataDLL?";

// TODO(oshima): Consider reading the image size from png IHDR chunk and

« no previous file with comments | « no previous file | no next file » | no next file with comments »