chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.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/extensions/browser_action_overflow_menu_controller.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: remove includes we don't need anymore 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

« chrome/browser/ui/views/browser_action_view.cc ('K') | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/location_bar/page_action_image_view.cc » ('j') | chrome/common/extensions/extension_action.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

index 2fba05ae44a990b541c3abe843b0d6ca76818e5b..1f57bdb5fb210c6ef4b043eff7b47bf3a6ce35b4 100644

--- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

+++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

@@ -40,11 +40,10 @@ BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(

size_t command_id = 1; // Menu id 0 is reserved, start with 1.

for (size_t i = start_index; i < views_->size(); ++i) {

BrowserActionView* view = (*views_)[i];

- scoped_ptr<gfx::Canvas> canvas(view->GetIconWithBadge());

menu_->AppendMenuItemWithIcon(

command_id,

UTF8ToUTF16(view->button()->extension()->name()),

- canvas->ExtractImageRep());

+ view->GetIconWithBadge());

// Set the tooltip for this item.

string16 tooltip = UTF8ToUTF16(