Update message center systray icon.

chrome/browser/ui/views/message_center/web_notification_tray_win.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/message_center/web_notification_tray_win.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/ui/views/message_center/notification_bubble_wrapper_win.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "grit/chromium_strings.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
+#include "ui/gfx/size.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/message_center/views/message_bubble_base.h"
 #include "ui/message_center/views/message_center_bubble.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Tray constants
 const int kScreenEdgePadding = 2;
 
+const int kSystemTrayWidth = 16;
+const int kSystemTrayHeight = 16;
+const int kNumberOfSystemTraySprites = 10;
+
 gfx::Rect GetCornerAnchorRect() {
   // TODO(dewittj): Use the preference to determine which corner to anchor from.
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
   gfx::Rect rect = screen->GetPrimaryDisplay().work_area();
   rect.Inset(kScreenEdgePadding, kScreenEdgePadding);
   return gfx::Rect(rect.bottom_right(), gfx::Size());
 }
 
 gfx::Point GetClosestCorner(gfx::Rect rect, gfx::Point query) {
   gfx::Point center_point = rect.CenterPoint();
@@ skipping 19 matching lines @@
   // TODO(dewittj): GetNativeScreen could be wrong for Aura.
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
   gfx::Rect work_area = screen->GetPrimaryDisplay().work_area();
   work_area.Inset(kScreenEdgePadding, kScreenEdgePadding);
   gfx::Point corner = GetClosestCorner(work_area, cursor);
 
   gfx::Rect mouse_anchor_rect(gfx::BoundingRect(cursor, corner));
   return mouse_anchor_rect;
 }
 
-gfx::ImageSkia GetIcon(bool has_unread) {
+gfx::ImageSkia GetIcon(int unread_count) {
+  bool has_unread = unread_count > 0;
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* icon = rb.GetImageSkiaNamed(
-      has_unread ? IDR_NOTIFICATION_TRAY_LIT : IDR_NOTIFICATION_TRAY_DIM);
-  DCHECK(icon);
-  return *icon;
+  if (!has_unread)
+    return *rb.GetImageSkiaNamed(IDR_NOTIFICATION_TRAY_DIM);

[Jun Mukai, 2013/04/19 19:00:50]

Do we use DIM for the default icon? not LIT? Better to double-check with somast
and jstark with screenshot. For ChromeOS, we will change the default icon color
to the one which is previously known as lit.

[dewittj, 2013/04/19 22:10:28]

I had the correct icon, but didn't change the name.  Should be clearer now.

+
+  // TODO(dewittj): Use scale factors other than 100P.
+  scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
+      gfx::Size(kSystemTrayWidth, kSystemTrayHeight),
+      ui::SCALE_FACTOR_100P,
+      false));
+
+  // Draw the attention-grabbing background image.
+  canvas->DrawImageInt(*rb.GetImageSkiaNamed(IDR_NOTIFICATION_TRAY_LIT), 0, 0);
+
+  // |numbers| is a sprite map with the image of a number from 1-9 and 9+. They
+  // are arranged horizontally, and have a transparent background.
+  gfx::ImageSkia* numbers = rb.GetImageSkiaNamed(IDR_NOTIFICATION_TRAY_NUMBERS);
+
+  // Assume that the last sprite is the catch-all for higher numbers of
+  // notifications.
+  int effective_unread = std::min(unread_count, kNumberOfSystemTraySprites);
+  int x_offset = (effective_unread - 1) * kSystemTrayWidth;
+
+  canvas->DrawImageInt(*numbers,
+                       x_offset, 0, kSystemTrayWidth, kSystemTrayHeight,
+                       0, 0, kSystemTrayWidth, kSystemTrayHeight,
+                       false);
+
+  return gfx::ImageSkia(canvas->ExtractImageRep());
 }
 
 }  // namespace
 
 namespace message_center {
 
 MessageCenterTrayDelegate* CreateMessageCenterTray() {
   return new WebNotificationTrayWin();
 }
 
@@ skipping 115 matching lines @@
   }
   return views::TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM;
 }
 
 gfx::NativeView WebNotificationTrayWin::GetBubbleWindowContainer() {
   return NULL;
 }
 
 void WebNotificationTrayWin::UpdateStatusIcon() {
   int unread_notifications = message_center()->UnreadNotificationCount();
-  status_icon_->SetImage(GetIcon(unread_notifications > 0));
+  status_icon_->SetImage(GetIcon(unread_notifications));
 
   string16 product_name(l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
   if (unread_notifications > 0) {
     string16 str_unread_count = base::FormatNumber(unread_notifications);
     status_icon_->SetToolTip(l10n_util::GetStringFUTF16(
         IDS_MESSAGE_CENTER_TOOLTIP_UNREAD, product_name, str_unread_count));
   } else {
     status_icon_->SetToolTip(l10n_util::GetStringFUTF16(
         IDS_MESSAGE_CENTER_TOOLTIP, product_name));
   }
@@ skipping 21 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTrayWin::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble_.get())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble_->bubble());
 }
 
 }  // namespace message_center