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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/task_manager_view.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
« no previous file with comments | « chrome/browser/ui/views/menu_model_adapter_test.cc ('k') | chrome/browser/ui/views/web_intent_picker_views.cc » ('j') | ui/base/models/table_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/task_manager_view.cc
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index bd56df45abbf1823a12042a5d035d71803bf2c97..b110211e06487f44b44c45635a34b7f5a1dcac17 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -67,7 +67,7 @@ class TaskManagerTableModel : public views::GroupTableModel,
// GroupTableModel.
int RowCount() OVERRIDE;
string16 GetText(int row, int column) OVERRIDE;
- SkBitmap GetIcon(int row) OVERRIDE;
+ gfx::ImageSkia GetIcon(int row) OVERRIDE;
void GetGroupRangeForItem(int item, views::GroupRange* range) OVERRIDE;
void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE;
@@ -163,7 +163,7 @@ string16 TaskManagerTableModel::GetText(int row, int col_id) {
}
}
-SkBitmap TaskManagerTableModel::GetIcon(int row) {
+gfx::ImageSkia TaskManagerTableModel::GetIcon(int row) {
return model_->GetResourceIcon(row);
}
« no previous file with comments | « chrome/browser/ui/views/menu_model_adapter_test.cc ('k') | chrome/browser/ui/views/web_intent_picker_views.cc » ('j') | ui/base/models/table_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698