ash/system/settings/tray_settings.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/settings/tray_settings.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/settings/tray_settings.cc

diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc

index 90898641d86130caa637ad07f84fe3a6f0a66747..8b96ffe94625d85bc07f9efa81f97bd67a6377f9 100644

--- a/ash/system/settings/tray_settings.cc

+++ b/ash/system/settings/tray_settings.cc

@@ -34,7 +34,7 @@ class SettingsView : public ash::internal::ActionableView {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

views::ImageView* icon =

new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);

- icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToSkBitmap());

+ icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());

AddChildView(icon);

string16 text = rb.GetLocalizedString(

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