summaryrefslogtreecommitdiffstats
path: root/ash/system/ime
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 03:57:18 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 03:57:18 +0000
commitded9c9f04d9ffaa30c0dbf0bff45751c7106b24b (patch)
tree1a66f45f6de6e81e928bb9d69ca47972cc90a61f /ash/system/ime
parentcf2d38822a0633972caf9c6f6d41e31a908d0c6e (diff)
downloadchromium_src-ded9c9f04d9ffaa30c0dbf0bff45751c7106b24b.zip
chromium_src-ded9c9f04d9ffaa30c0dbf0bff45751c7106b24b.tar.gz
chromium_src-ded9c9f04d9ffaa30c0dbf0bff45751c7106b24b.tar.bz2
Adds icons of IME and Locale notifications.
ash_resources contains images for both of those notifications but somehow not specified at all. BUG=262393 R=stevenjb@chromium.org TEST=manually Review URL: https://chromiumcodereview.appspot.com/22901015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/ime')
-rw-r--r--ash/system/ime/tray_ime.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index 6fac8fd..e8c9eda 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -218,6 +218,7 @@ void TrayIME::UpdateOrCreateNotification() {
IMEInfo current;
delegate->GetCurrentIME(&current);
+ ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
scoped_ptr<Notification> notification(new Notification(
message_center::NOTIFICATION_TYPE_SIMPLE,
kIMENotificationId,
@@ -227,7 +228,7 @@ void TrayIME::UpdateOrCreateNotification() {
IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE,
current.medium_name),
base::string16(), // message
- gfx::Image(), // icon
+ bundle.GetImageNamed(IDR_AURA_UBER_TRAY_IME),
base::string16(), // display_source
"", // extension_id
message_center::RichNotificationData(),