Adds a small icon to notifications, and connects it to synced notifications.

chrome/browser/notifications/sync_notifier/synced_notification.cc

 // Copyright (c) 2012 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/notifications/sync_notifier/synced_notification.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.h"
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "skia/ext/image_operations.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/synced_notification_specifics.pb.h"
+#include "third_party/skia/include/core/SkPaint.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/size.h"
+#include "ui/gfx/skbitmap_operations.h"
+#include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification_types.h"
 
 namespace {
 const char kExtensionScheme[] = "synced-notification://";
 const char kDefaultSyncedNotificationScheme[] = "https:";
 
 // Today rich notifications only supports two buttons, make sure we don't
 // try to supply them with more than this number of buttons.
 const unsigned int kMaxNotificationButtonIndex = 2;
@@ skipping 266 matching lines @@
       message_center::ButtonInfo button_info(base::UTF8ToUTF16(title));
       if (!button_bitmaps_[i].IsEmpty())
         button_info.icon = button_bitmaps_[i];
       rich_notification_data.buttons.push_back(button_info);
     }
 
     // Fill in the bitmap images.
     if (!image_bitmap_.IsEmpty())
       rich_notification_data.image = image_bitmap_;
 
+    if (!app_icon_bitmap_.IsEmpty()) {
+      // Since we can't control the size of images we download, resize using a
+      // high quality filter down to the appropriate icon size.
+      // TODO(dewittj): Remove this when correct resources are sent via the
+      // protobuf.
+      SkBitmap new_app_icon =
+          skia::ImageOperations::Resize(app_icon_bitmap_.AsBitmap(),
+                                        skia::ImageOperations::RESIZE_BEST,
+                                        message_center::kSmallImageSize,
+                                        message_center::kSmallImageSize);
+
+      // The app icon should be in grayscale.
+      // TODO(dewittj): Remove this when correct resources are sent via the
+      // protobuf.
+      color_utils::HSL shift = {-1, 0, 0.6};
+      SkBitmap grayscale =
+          SkBitmapOperations::CreateHSLShiftedBitmap(new_app_icon, shift);
+      gfx::Image small_image =
+          gfx::Image(gfx::ImageSkia(gfx::ImageSkiaRep(grayscale, 1.0f)));
+      rich_notification_data.small_image = small_image;
+    }
+
     // Set the ContextMessage inside the rich notification data for the
     // annotation.
     rich_notification_data.context_message = annotation;
 
     // If there is at least one person sending, use the first picture.
     // TODO(petewil): Someday combine multiple profile photos here.
     gfx::Image icon_bitmap = app_icon_bitmap_;
     if (GetProfilePictureCount() >= 1)  {
       icon_bitmap = sender_bitmap_;
     }
 
     Notification ui_notification(notification_type,
                                  GetOriginUrl(),
                                  notification_heading,
                                  notification_text,
                                  icon_bitmap,
                                  blink::WebTextDirectionDefault,
                                  message_center::NotifierId(GetOriginUrl()),
                                  display_source,
                                  replace_key,
                                  rich_notification_data,
                                  delegate.get());
-
     // In case the notification is not supposed to be toasted, pretend that it
     // has already been shown.
     ui_notification.set_shown_as_popup(!toast_state_);
 
     notification_manager->Add(ui_notification, profile);
   } else {
     // In this case we have a Webkit Notification, not a Rich Notification.
     Notification ui_notification(GetOriginUrl(),
                                  GetAppIconUrl(),
                                  notification_heading,
@@ skipping 383 matching lines @@
 
 const gfx::Image& SyncedNotification::GetAppIcon() const {
   return app_icon_bitmap_;
 }
 
 void SyncedNotification::SetToastState(bool toast_state) {
   toast_state_ = toast_state;
 }
 
 }  // namespace notifier