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

Unified Diff: ui/views/controls/table/table_view_views.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
Index: ui/views/controls/table/table_view_views.cc
diff --git a/ui/views/controls/table/table_view_views.cc b/ui/views/controls/table/table_view_views.cc
index 365f81ba22ab539468204e6dbf4e4de54bf3c62b..bc274125f0c805452815e796c3fff53f6d91cb09 100644
--- a/ui/views/controls/table/table_view_views.cc
+++ b/ui/views/controls/table/table_view_views.cc
@@ -5,10 +5,10 @@
#include "ui/views/controls/table/table_view_views.h"
#include "base/i18n/rtl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/models/table_model.h"
-#include "ui/gfx/canvas.h"
#include "ui/base/native_theme/native_theme.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/skia_util.h"
#include "ui/views/border.h"
#include "ui/views/controls/scroll_view.h"
@@ -249,7 +249,7 @@ void TableView::OnPaint(gfx::Canvas* canvas) {
}
int text_x = kTextHorizontalPadding;
if (table_type_ == ICON_AND_TEXT) {
- SkBitmap image = model_->GetIcon(i);
+ gfx::ImageSkia image = model_->GetIcon(i);
if (!image.isNull()) {
int image_x = GetMirroredXWithWidthInView(text_x, image.width());
canvas->DrawBitmapInt(

Powered by Google App Engine
This is Rietveld 408576698