ash/system/ime/tray_ime.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/ime/tray_ime.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: 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/ime/tray_ime.cc

diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc

index e859372fc901f0bcd78086fa65f634c0193e219d..7f560723bbb82a669939b5c2216dddb079389bba 100644

--- a/ash/system/ime/tray_ime.cc

+++ b/ash/system/ime/tray_ime.cc

@@ -36,7 +36,7 @@ class IMEDefaultView : public TrayItemMore {

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

SetImage(bundle.GetImageNamed(

- IDR_AURA_UBER_TRAY_IME).ToSkBitmap());

+ IDR_AURA_UBER_TRAY_IME).ToImageSkia());

IMEInfo info;

Shell::GetInstance()->tray_delegate()->GetCurrentIME(&info);

« ash/system/audio/tray_volume.cc ('K') | « ash/system/drive/tray_drive.cc ('k') | ash/system/settings/tray_settings.cc » ('j') | no next file with comments »