Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2196)

Unified Diff: ash/system/web_notification/web_notification_tray.cc

Issue 2005063002: Use vector icon for no unread notifications bell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete unused pngs Created 4 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
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/notification_tray_bell.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/web_notification/web_notification_tray.cc
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index e8c9e70bc73f43388104dcc6546d6b0ba0f2b15a..a23bf8965d0c7ca4ec813ad1ff28220197bd6a17 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -25,14 +25,14 @@
#include "base/i18n/rtl.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
#include "ui/message_center/message_center_style.h"
#include "ui/message_center/message_center_tray_delegate.h"
#include "ui/message_center/views/message_bubble_base.h"
@@ -74,7 +74,7 @@ namespace {
const SkColor kWebNotificationColorNoUnread =
SkColorSetARGB(128, 255, 255, 255);
const SkColor kWebNotificationColorWithUnread = SK_ColorWHITE;
-
+const int kNoUnreadIconSize = 18;
}
// Class to initialize and manage the WebNotificationBubble and
@@ -122,10 +122,9 @@ class WebNotificationButton : public views::CustomButton {
unread_count_(0) {
SetLayoutManager(new views::FillLayout);
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- no_unread_icon_.SetImage(
- rb.GetImageNamed(IDR_ASH_SHELF_NOTIFICATION_TRAY_BELL).ToImageSkia());
- no_unread_icon_.SetImageSize(gfx::Size(18, 18));
+ no_unread_icon_.SetImage(gfx::CreateVectorIcon(
+ gfx::VectorIconId::NOTIFICATIONS, kNoUnreadIconSize,
+ kWebNotificationColorNoUnread));
no_unread_icon_.set_owned_by_client();
unread_label_.set_owned_by_client();
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/notification_tray_bell.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698