chrome/browser/ui/views/browser_actions_container.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/browser_actions_container.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_action_view.cc ('k') | chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc » ('j') | chrome/common/extensions/extension_action.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/browser_actions_container.cc

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

index 9508b0acaf43113be736a657afe31a4c3ae8073f..2c8046a8f8d02d4753dc56a13fbf3599bbd3bc0f 100644

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

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

@@ -403,9 +403,8 @@ void BrowserActionsContainer::WriteDragDataForView(View* sender,

BrowserActionButton* button = browser_action_views_[i]->button();

if (button == sender) {

// Set the dragging image for the icon.

- scoped_ptr<gfx::Canvas> canvas(

- browser_action_views_[i]->GetIconWithBadge());

- drag_utils::SetDragImageOnDataObject(*canvas, button->size(), press_pt,

+ gfx::ImageSkia badge(browser_action_views_[i]->GetIconWithBadge());

+ drag_utils::SetDragImageOnDataObject(badge, button->size(), press_pt,

data);

// Fill in the remaining info.