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

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.h

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

index d701de8afe8c172a5ad217ddcf51178c0bac47bd..bd9c592b1571c2e6f5a6412ea01901b7c1653ded 100644

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

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

@@ -168,7 +168,7 @@ class ExtensionAction {

void CacheIcon(const std::string& path, const gfx::Image& icon);

// Set this action's icon bitmap on a specific tab.

- void SetIcon(int tab_id, const SkBitmap& bitmap);

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

// Get the icon for a tab, or the default if no icon was set for this tab,

// retrieving icons that have been specified by path from the previous

« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/common/extensions/extension_action.cc » ('j') | no next file with comments »