views/controls/menu/menu_win.cc - Issue 113443: ChromeCanvas->gfx::Canvas

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: views/controls/menu/menu_win.cc

Issue 113443: ChromeCanvas->gfx::Canvas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 11 years, 7 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: views/controls/menu/menu_win.cc

===================================================================

--- views/controls/menu/menu_win.cc (revision 16147)

+++ views/controls/menu/menu_win.cc (working copy)

@@ -12,8 +12,8 @@

#include <atlmisc.h>

#include <string>

-#include "app/gfx/chrome_canvas.h"

-#include "app/gfx/chrome_font.h"

+#include "app/gfx/canvas.h"

+#include "app/gfx/font.h"

#include "app/l10n_util.h"

#include "app/l10n_util_win.h"

#include "base/gfx/rect.h"

@@ -188,7 +188,7 @@

// Draw the icon after the label, otherwise it would be covered

// by the label.

if (data->icon.width() != 0 && data->icon.height() != 0) {

- ChromeCanvas canvas(data->icon.width(), data->icon.height(), false);

+ gfx::Canvas canvas(data->icon.width(), data->icon.height(), false);

canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);

canvas.DrawBitmapInt(data->icon, 0, 0);

canvas.getTopPlatformDevice().drawToHDC(hDC, lpdis->rcItem.left +

« no previous file with comments | « views/controls/menu/chrome_menu.cc ('k') | views/controls/native_control.h » ('j') | no next file with comments »