chrome/browser/views/browser_actions_container.cc - Issue 242150: Implement browserAction.setIcon(ImageData) for extensions.

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/views/browser_actions_container.cc

Issue 242150: Implement browserAction.setIcon(ImageData) for extensions. (Closed)

Patch Set: common function Created 11 years, 2 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/views/browser_actions_container.cc

diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc

index 2fba91b359fdf9481881d0d28641348c4dfdd887..04ad9b35d45d809e85cc6af1b002c27d9b59c71c 100644

--- a/chrome/browser/views/browser_actions_container.cc

+++ b/chrome/browser/views/browser_actions_container.cc

@@ -160,7 +160,9 @@ void BrowserActionImageView::OnImageLoaded(SkBitmap* image, size_t index) {

}

void BrowserActionImageView::OnStateUpdated() {

- SkBitmap* image = &browser_action_icons_[browser_action_state_->icon_index()];

+ SkBitmap* image = browser_action_state_->icon();

+ if (!image)

+ image = &browser_action_icons_[browser_action_state_->icon_index()];

SetIcon(*image);

SetTooltipText(ASCIIToWide(browser_action_state_->title()));

panel_->OnBrowserActionVisibilityChanged();