summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 02:41:38 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 02:41:38 +0000
commit5b7663425f8728e70fb1c251deb58773f6e8bd01 (patch)
tree3886393d34442cff0dfab3d2a89d1e967cd5910a /ash
parent4b49962f0bae3e90b2d9b2fb6400512fffd488c0 (diff)
downloadchromium_src-5b7663425f8728e70fb1c251deb58773f6e8bd01.zip
chromium_src-5b7663425f8728e70fb1c251deb58773f6e8bd01.tar.gz
chromium_src-5b7663425f8728e70fb1c251deb58773f6e8bd01.tar.bz2
Uses managed_mode_user icon image for locally_managed_user notification.
BUG=262393 R=stevenjb@chromium.org Review URL: https://chromiumcodereview.appspot.com/22824030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/chromeos/managed/tray_locally_managed_user.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/system/chromeos/managed/tray_locally_managed_user.cc b/ash/system/chromeos/managed/tray_locally_managed_user.cc
index 2ff427f..e42ea6f 100644
--- a/ash/system/chromeos/managed/tray_locally_managed_user.cc
+++ b/ash/system/chromeos/managed/tray_locally_managed_user.cc
@@ -10,6 +10,7 @@
#include "ash/system/user/login_status.h"
#include "base/logging.h"
#include "grit/ash_resources.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification.h"
#include "ui/message_center/notification_delegate.h"
@@ -73,12 +74,13 @@ void TrayLocallyManagedUser::UpdateAfterLoginStatusChange(
void TrayLocallyManagedUser::CreateOrUpdateNotification(
const base::string16& new_message) {
+ ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
scoped_ptr<Notification> notification(new Notification(
message_center::NOTIFICATION_TYPE_SIMPLE,
kNotificationId,
new_message,
base::string16() /* body is empty */,
- gfx::Image() /* icon */,
+ bundle.GetImageNamed(IDR_AURA_UBER_TRAY_MANAGED_USER),
base::string16() /* display_source */,
std::string() /* extension_id */,
message_center::RichNotificationData(),