ash/system/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.cc

diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc

index 4350664d495dea01f7640ee4af78341d5456e40a..639f79fb9b3ad69858765a6d0227b2ce820c5c2f 100644

--- a/ash/system/bluetooth/tray_bluetooth.cc

+++ b/ash/system/bluetooth/tray_bluetooth.cc

@@ -33,7 +33,7 @@ class BluetoothDefaultView : public TrayItemMore {

explicit BluetoothDefaultView(SystemTrayItem* owner)

: TrayItemMore(owner) {

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

- SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToSkBitmap());

+ SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia());

UpdateLabel();

}

« no previous file with comments | « ash/system/audio/tray_volume.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | no next file with comments »