chrome/browser/ui/views/location_bar/page_action_image_view.cc - Issue 10827191: Convert extension action icons code to use ImageSkia instead of SkBitmap

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/ui/views/location_bar/page_action_image_view.cc

Issue 10827191: Convert extension action icons code to use ImageSkia instead of SkBitmap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc ('k') | chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc » ('j') | chrome/common/extensions/extension_action.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/page_action_image_view.cc

diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc

index 583e2d20a77a46cddbee231bc4dabea7c679821b..25bfa2e244e4f7b99c9ae80579ab13236f63a8ef 100644

--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc

+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc

@@ -271,9 +271,8 @@ void PageActionImageView::UpdateVisibility(WebContents* contents,

// Set the image.

gfx::Image icon = page_action_->GetIcon(current_tab_id_);

- if (!icon.IsEmpty()) {

+ if (!icon.IsEmpty())

SetImage(*icon.ToImageSkia());

- }

SetVisible(true);

}