chrome/common/extensions/extension.cc - Issue 10855090: extensions: Fix crash on empty extension action icons

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/common/extensions/extension.cc

Issue 10855090: extensions: Fix crash on empty extension action icons (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: rebase more Created 8 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:

Index: chrome/common/extensions/extension.cc

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc

index fffe1f163a208d3cd8e58229db6f6abdceb6c519..4f3aaf7c94cda355d97901b7c8153717b59e785c 100644

--- a/chrome/common/extensions/extension.cc

+++ b/chrome/common/extensions/extension.cc

@@ -2378,8 +2378,8 @@ bool Extension::LoadScriptBadge(string16* error) {

} else {

script_badge_->SetIcon(

ExtensionAction::kDefaultTabId,

- *ui::ResourceBundle::GetSharedInstance().GetImageNamed(

- IDR_EXTENSIONS_FAVICON).ToSkBitmap());

+ ui::ResourceBundle::GetSharedInstance().GetImageNamed(

+ IDR_EXTENSIONS_FAVICON));

}

return true;