ui/base/models/table_model.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/base/models/table_model.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/base/models/table_model.cc

diff --git a/ui/base/models/table_model.cc b/ui/base/models/table_model.cc

index 921ca89bd5c8402d395e920c7a298bf9ed175f96..0ab093fbf05f76cc9adb9d346e456e7972b59096 100644

--- a/ui/base/models/table_model.cc

+++ b/ui/base/models/table_model.cc

@@ -5,7 +5,7 @@

#include "ui/base/models/table_model.h"

#include "base/logging.h"

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

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

msw 2012/05/29 07:50:51 Drive-by nit (prompted by http://codereview.chromi

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

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

@@ -74,8 +74,8 @@ TableColumn::TableColumn(int id, Alignment alignment, int width, float percent)

// Used for sorting.

static icu::Collator* collator = NULL;

-SkBitmap TableModel::GetIcon(int row) {

- return SkBitmap();

+gfx::ImageSkia TableModel::GetIcon(int row) {

+ return gfx::ImageSkia();

}

string16 TableModel::GetTooltip(int row) {

« no previous file with comments | « ui/base/models/table_model.h ('k') | ui/base/models/tree_model.h » ('j') | ui/views/controls/button/text_button.h » ('J')