ui/views/controls/table/table_view_win.cc - Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

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: ui/views/controls/table/table_view_win.cc

Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 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

« ui/views/controls/menu/native_menu_win.cc ('K') | « ui/views/controls/table/table_view_views.cc ('k') | ui/views/controls/textfield/native_textfield_views_unittest.cc » ('j') | ui/views/controls/throbber.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/table/table_view_win.cc

diff --git a/ui/views/controls/table/table_view_win.cc b/ui/views/controls/table/table_view_win.cc

index 3a1be575995926a22d940d4e30ab82adabf2208c..42a266aeb2ae793c595dacec76ae7bf140eea40f 100644

--- a/ui/views/controls/table/table_view_win.cc

+++ b/ui/views/controls/table/table_view_win.cc

@@ -13,7 +13,7 @@

#include "base/string_util.h"

#include "base/win/scoped_gdi_object.h"

#include "skia/ext/skia_utils_win.h"

-#include "third_party/skia/include/core/SkBitmap.h"

+#include "ui/gfx/image/image_skia.h"

msw 2012/05/29 07:50:51 nit: remove this include; it's duplicated below in

#include "third_party/skia/include/core/SkColorFilter.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/l10n/l10n_util_win.h"

@@ -24,6 +24,7 @@

#include "ui/gfx/favicon_size.h"

#include "ui/gfx/font.h"

#include "ui/gfx/icon_util.h"

+#include "ui/gfx/image/image_skia.h"

#include "ui/views/controls/native/native_view_host.h"

#include "ui/views/controls/table/table_view_observer.h"

@@ -1225,7 +1226,7 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {

LRESULT r = CDRF_DODEFAULT;

// First let's take care of painting the right icon.

if (table_type_ == ICON_AND_TEXT) {

- SkBitmap image = model_->GetIcon(model_index);

+ gfx::ImageSkia image = model_->GetIcon(model_index);

if (!image.isNull()) {

// Get the rect that holds the icon.

RECT icon_rect, client_rect;