Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: views/controls/menu/native_menu_win.cc

Issue 7019013: Removal of dependencies on PlatformDevice classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Syncing merge conflicts. Created 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/menu/menu_win.cc ('k') | views/controls/table/native_table_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/native_menu_win.cc
===================================================================
--- views/controls/menu/native_menu_win.cc (revision 86706)
+++ views/controls/menu/native_menu_win.cc (working copy)
@@ -250,8 +250,8 @@
gfx::CanvasSkia canvas(icon.width(), icon.height(), false);
canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
canvas.DrawBitmapInt(icon, 0, 0);
- canvas.getTopPlatformDevice().drawToHDC(dc,
- draw_item_struct->rcItem.left + kItemLeftMargin,
+ skia::DrawToNativeContext(
+ &canvas, dc, draw_item_struct->rcItem.left + kItemLeftMargin,
draw_item_struct->rcItem.top + (draw_item_struct->rcItem.bottom -
draw_item_struct->rcItem.top - icon.height()) / 2, NULL);
} else if (type == ui::MenuModel::TYPE_CHECK &&
@@ -283,7 +283,7 @@
&canvas, NativeTheme::kMenuCheck, state, bounds, extra);
// Draw checkbox to menu.
- canvas.getTopPlatformDevice().drawToHDC(dc,
+ skia::DrawToNativeContext(&canvas, dc,
draw_item_struct->rcItem.left + kItemLeftMargin,
draw_item_struct->rcItem.top + (draw_item_struct->rcItem.bottom -
draw_item_struct->rcItem.top - config.check_height) / 2, NULL);
« no previous file with comments | « views/controls/menu/menu_win.cc ('k') | views/controls/table/native_table_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698