chrome/browser/ui/views/hung_renderer_view.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: chrome/browser/ui/views/hung_renderer_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/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/infobars/infobar_button_border.cc » ('j') | ui/base/models/table_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/hung_renderer_view.cc

diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc

index bcd3e916ce575fd96b230a70c34dab3f7037d295..3e8428c65b7afac54b1513da3bb2f1da341e913e 100644

--- a/chrome/browser/ui/views/hung_renderer_view.cc

+++ b/chrome/browser/ui/views/hung_renderer_view.cc

@@ -84,7 +84,7 @@ class HungPagesTableModel : public views::GroupTableModel {

// Overridden from views::GroupTableModel:

virtual int RowCount();

virtual string16 GetText(int row, int column_id);

- virtual SkBitmap GetIcon(int row);

+ virtual gfx::ImageSkia GetIcon(int row);

virtual void SetObserver(ui::TableModelObserver* observer);

virtual void GetGroupRangeForItem(int item, views::GroupRange* range);

@@ -188,7 +188,7 @@ string16 HungPagesTableModel::GetText(int row, int column_id) {

return title;

}

-SkBitmap HungPagesTableModel::GetIcon(int row) {

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

DCHECK(row >= 0 && row < RowCount());

return tab_observers_[row]->favicon_tab_helper()->GetFavicon();

}