ash/system/tray/tray_image_item.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: ash/system/tray/tray_image_item.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: ash/system/tray/tray_image_item.cc

diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc

index a92f2ad3baca34dccc6099a7ee1764bf122604aa..449cbd72c7a8d46d3171745b2c1b91be05fc6f59 100644

--- a/ash/system/tray/tray_image_item.cc

+++ b/ash/system/tray/tray_image_item.cc

@@ -29,7 +29,7 @@ views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {

tray_view_ = new TrayItemView;

tray_view_->CreateImageView();

tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance().

- GetImageNamed(resource_id_).ToSkBitmap());

+ GetImageNamed(resource_id_).ToImageSkia());

tray_view_->SetVisible(GetInitialVisibility());

return tray_view_;

}

« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | ash/system/tray/tray_item_more.h » ('j') | no next file with comments »