chrome/browser/ui/views/toolbar/browser_actions_container.cc - Issue 1214243003: [Extensions UI] Clean up extension icon generation

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

Issue 1214243003: [Extensions UI] Clean up extension icon generation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: s/skia/ImageSkia Created 5 years, 5 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/ui/views/toolbar/browser_actions_container.cc

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

index e157cbbd20c9c7b7e93866d88a99ce65a461d1ef..c852ab9df727befe824d123c1d305cb5d3555a50 100644

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

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

@@ -615,8 +615,10 @@ void BrowserActionsContainer::WriteDragDataForView(View* sender,

sender);

DCHECK(iter != toolbar_action_views_.end());

ToolbarActionViewController* view_controller = (*iter)->view_controller();

+ gfx::Size size(ToolbarActionsBar::IconWidth(false),

+ ToolbarActionsBar::IconHeight());

drag_utils::SetDragImageOnDataObject(

- view_controller->GetIconWithBadge(),

+ view_controller->GetIcon(GetCurrentWebContents(), size).AsImageSkia(),

press_pt.OffsetFromOrigin(),

data);

// Fill in the remaining info.