chrome/common/extensions/extension_action.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_action.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_action.cc

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

index 46d8a7d53b3198fbe1dea33ccbb84ef3a672ce80..6567e5c7c41c686148e5c0dbbfc4db1490a00332 100644

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

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

@@ -223,8 +223,8 @@ void ExtensionAction::CacheIcon(const std::string& path,

path_to_icon_cache_.insert(std::make_pair(path, icon));

}

-void ExtensionAction::SetIcon(int tab_id, const SkBitmap& bitmap) {

- SetValue(&icon_, tab_id, gfx::Image(bitmap));

+void ExtensionAction::SetIcon(int tab_id, const gfx::Image& image) {

+ SetValue(&icon_, tab_id, image);

}

gfx::Image ExtensionAction::GetIcon(int tab_id) const {