chrome/browser/ui/views/browser_action_view.cc - Issue 10696130: Get rid of implicit conversion to and from ImageSkiaRep

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_action_view.cc

Issue 10696130: Get rid of implicit conversion to and from ImageSkiaRep (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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/browser_action_view.cc

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

index 073d80ecd18bf62997aba32f48ff18d7913c87d3..27fb6f118725405c9aa86d91f88ec163c3b2117c 100644

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

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

@@ -361,7 +361,8 @@ gfx::Canvas* BrowserActionView::GetIconWithBadge() {

if (icon.isNull())

icon = button_->default_icon();

- gfx::Canvas* canvas = new gfx::Canvas(icon, false);

+ gfx::Canvas* canvas =

+ new gfx::Canvas(gfx::ImageSkiaRep(icon, ui::SCALE_FACTOR_100P), false);

if (tab_id >= 0) {

gfx::Rect bounds(icon.width(), icon.height() + ToolbarView::kVertSpacing);