chrome/browser/ui/views/sad_tab_view.cc - Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::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/sad_tab_view.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::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: chrome/browser/ui/views/sad_tab_view.cc

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

index 0da6523eaffec71c029ed55bff2b0e7dc4e23eaa..a1e6d85554320b8b4c85acc5de09b0d904d5d519 100644

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

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

@@ -157,7 +157,7 @@ void SadTabView::ViewHierarchyChanged(bool is_add,

columns->AddPaddingColumn(1, kPadding);

views::ImageView* image = new views::ImageView();

- image->SetImage(ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(

+ image->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

(kind_ == CRASHED) ? IDR_SAD_TAB : IDR_KILLED_TAB));

layout->StartRowWithPadding(0, column_set_id, 1, kPadding);

layout->AddView(image);

« no previous file with comments | « chrome/browser/ui/views/notifications/balloon_view.cc ('k') | chrome/browser/ui/views/tabs/base_tab.cc » ('j') | no next file with comments »