| Index: ash/common/system/chromeos/session/tray_session_length_limit.cc
|
| diff --git a/ash/common/system/chromeos/session/tray_session_length_limit.cc b/ash/common/system/chromeos/session/tray_session_length_limit.cc
|
| index 7c1025e764b70b6284b464b0fb36c77d450e37f5..e1aa7d8ec09d6133e0e4003bf9cc776963f5048b 100644
|
| --- a/ash/common/system/chromeos/session/tray_session_length_limit.cc
|
| +++ b/ash/common/system/chromeos/session/tray_session_length_limit.cc
|
| @@ -13,15 +13,17 @@
|
| #include "ash/common/system/tray/system_tray.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| #include "ash/common/system/tray/system_tray_notifier.h"
|
| +#include "ash/common/system/tray/tray_constants.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/resources/grit/ash_resources.h"
|
| +#include "ash/resources/vector_icons/vector_icons.h"
|
| #include "ash/shell.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| #include "base/logging.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/l10n/time_format.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/gfx/paint_vector_icon.h"
|
| #include "ui/message_center/message_center.h"
|
| #include "ui/message_center/notification.h"
|
| #include "ui/views/view.h"
|
| @@ -143,7 +145,6 @@ void TraySessionLengthLimit::UpdateNotification() {
|
| return;
|
| }
|
|
|
| - ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
|
| message_center::RichNotificationData data;
|
| data.should_make_spoken_feedback_for_popup_updates =
|
| (limit_state_ != last_limit_state_);
|
| @@ -152,8 +153,8 @@ void TraySessionLengthLimit::UpdateNotification() {
|
| message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId,
|
| base::string16() /* title */,
|
| ComposeNotificationMessage() /* message */,
|
| - bundle.GetImageNamed(
|
| - IDR_AURA_UBER_TRAY_NOTIFICATION_SESSION_LENGTH_LIMIT),
|
| + gfx::Image(
|
| + gfx::CreateVectorIcon(kSystemMenuTimerIcon, kMenuIconColor)),
|
| base::string16() /* display_source */, GURL(),
|
| message_center::NotifierId(
|
| message_center::NotifierId::SYSTEM_COMPONENT,
|
|
|