Index: chrome/views/table_view.cc |
=================================================================== |
--- chrome/views/table_view.cc (revision 6142) |
+++ chrome/views/table_view.cc (working copy) |
@@ -9,7 +9,6 @@ |
#include "base/string_util.h" |
#include "base/win_util.h" |
-#include "base/gfx/skia_utils.h" |
#include "chrome/common/gfx/chrome_canvas.h" |
#include "chrome/common/gfx/favicon_size.h" |
#include "chrome/common/gfx/icon_util.h" |
@@ -18,6 +17,7 @@ |
#include "chrome/views/hwnd_view.h" |
#include "SkBitmap.h" |
#include "SkColorFilter.h" |
+#include "skia/ext/skia_utils_win.h" |
namespace views { |
@@ -1175,10 +1175,10 @@ |
custom_cell_font_ = CreateFontIndirect(&logfont); |
SelectObject(draw_info->nmcd.hdc, custom_cell_font_); |
draw_info->clrText = foreground.color_is_set |
- ? gfx::SkColorToCOLORREF(foreground.color) |
+ ? skia::SkColorToCOLORREF(foreground.color) |
: CLR_DEFAULT; |
draw_info->clrTextBk = background.color_is_set |
- ? gfx::SkColorToCOLORREF(background.color) |
+ ? skia::SkColorToCOLORREF(background.color) |
: CLR_DEFAULT; |
return CDRF_NEWFONT; |
} |
@@ -1228,7 +1228,7 @@ |
// background (or rather windows paints background, then invokes |
// this twice). As such, we always fill in the background. |
canvas.drawColor( |
- gfx::COLORREFToSkColor(GetSysColor(bg_color_index)), |
+ skia::COLORREFToSkColor(GetSysColor(bg_color_index)), |
SkPorterDuff::kSrc_Mode); |
// + 1 for padding (we declared the image as 18x18 in the list- |
// view when they are 16x16 so we get an extra pixel of padding). |