Revert 272211 "Allow high-res bitmaps to be passed in from notif..."

trunk/src/chrome/browser/extensions/api/notifications/notifications_api.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/extensions/api/notifications/notifications_api.h"
 
 #include "base/callback.h"
 #include "base/guid.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/extensions/api/notifications/notification_style.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/features/feature.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/layout.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace notifications = api::notifications;
 
 namespace {
 
 const char kMissingRequiredPropertiesForCreateNotification[] =
     "Some of the required properties are missing: type, iconUrl, title and "
     "message.";
-const char kUnableToDecodeIconError[] =
-    "Unable to successfully use the provided image.";
 const char kUnexpectedProgressValueForNonProgressType[] =
     "The progress value should not be specified for non-progress notification";
 const char kInvalidProgressValue[] =
     "The progress value should range from 0 to 100";
-const char kExtraListItemsProvided[] =
-    "List items provided for notification type != list";
-const char kExtraImageProvided[] =
-    "Image resource provided for notification type != image";
 
 // Converts an object with width, height, and data in RGBA format into an
 // gfx::Image (in ARGB format).
 bool NotificationBitmapToGfxImage(
-    float max_scale,
-    const gfx::Size& target_size_dips,
     api::notifications::NotificationBitmap* notification_bitmap,
     gfx::Image* return_image) {
   if (!notification_bitmap)
     return false;
 
-  const int max_device_pixel_width = target_size_dips.width() * max_scale;
-  const int max_device_pixel_height = target_size_dips.height() * max_scale;
-
+  // Ensure a sane set of dimensions.
+  const int max_width = message_center::kNotificationPreferredImageWidth;
+  const int max_height = message_center::kNotificationPreferredImageHeight;
   const int BYTES_PER_PIXEL = 4;
 
   const int width = notification_bitmap->width;
   const int height = notification_bitmap->height;
 
-  if (width < 0 || height < 0 || width > max_device_pixel_width ||
-      height > max_device_pixel_height)
+  if (width < 0 || height < 0 || width > max_width || height > max_height)
     return false;
 
   // Ensure we have rgba data.
   std::string* rgba_data = notification_bitmap->data.get();
   if (!rgba_data)
     return false;
 
   const size_t rgba_data_length = rgba_data->length();
   const size_t rgba_area = width * height;
 
@@ skipping 18 matching lines @@
   for (size_t t = 0; t < rgba_area; ++t) {
     // |c_rgba_data| is RGBA, pixels is ARGB.
     size_t rgba_index = t * BYTES_PER_PIXEL;
     pixels[t] = SkPreMultiplyColor(
         ((c_rgba_data[rgba_index + 3] & 0xFF) << 24) |
         ((c_rgba_data[rgba_index + 0] & 0xFF) << 16) |
         ((c_rgba_data[rgba_index + 1] & 0xFF) << 8) |
         ((c_rgba_data[rgba_index + 2] & 0xFF) << 0));
   }
 
-  // TODO(dewittj): Handle HiDPI images with more than one scale factor
-  // representation.
+  // TODO(dewittj): Handle HiDPI images.
   gfx::ImageSkia skia(gfx::ImageSkiaRep(bitmap, 1.0f));
   *return_image = gfx::Image(skia);
   return true;
 }
 
 // Given an extension id and another id, returns an id that is unique
 // relative to other extensions.
 std::string CreateScopedIdentifier(const std::string& extension_id,
                                    const std::string& id) {
   return extension_id + "-" + id;
@@ skipping 123 matching lines @@
   // First, make sure the required fields exist: type, title, message,  icon.
   // These fields are defined as optional in IDL such that they can be used as
   // optional for notification updates. But for notification creations, they
   // should be present.
   if (options->type == api::notifications::TEMPLATE_TYPE_NONE ||
       !options->icon_url || !options->title || !options->message) {
     SetError(kMissingRequiredPropertiesForCreateNotification);
     return false;
   }
 
-  NotificationBitmapSizes bitmap_sizes = GetNotificationBitmapSizes();
-
-  float image_scale =
-      ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactors().back());
-
   // Extract required fields: type, title, message, and icon.
   message_center::NotificationType type =
       MapApiTemplateTypeToType(options->type);
   const base::string16 title(base::UTF8ToUTF16(*options->title));
   const base::string16 message(base::UTF8ToUTF16(*options->message));
   gfx::Image icon;
 
-  if (!NotificationBitmapToGfxImage(image_scale,
-                                    bitmap_sizes.icon_size,
-                                    options->icon_bitmap.get(),
-                                    &icon)) {
-    SetError(kUnableToDecodeIconError);
-    return false;
-  }
+  // TODO(dewittj): Return error if this fails.
+  NotificationBitmapToGfxImage(options->icon_bitmap.get(), &icon);
 
   // Then, handle any optional data that's been provided.
   message_center::RichNotificationData optional_fields;
   if (options->priority.get())
     optional_fields.priority = *options->priority;
 
   if (options->event_time.get())
     optional_fields.timestamp = base::Time::FromJsTime(*options->event_time);
 
   if (options->buttons.get()) {
     // Currently we allow up to 2 buttons.
     size_t number_of_buttons = options->buttons->size();
     number_of_buttons = number_of_buttons > 2 ? 2 : number_of_buttons;
 
     for (size_t i = 0; i < number_of_buttons; i++) {
       message_center::ButtonInfo info(
           base::UTF8ToUTF16((*options->buttons)[i]->title));
-      NotificationBitmapToGfxImage(image_scale,
-                                   bitmap_sizes.button_icon_size,
-                                   (*options->buttons)[i]->icon_bitmap.get(),
-                                   &info.icon);
+      NotificationBitmapToGfxImage((*options->buttons)[i]->icon_bitmap.get(),
+                                    &info.icon);
       optional_fields.buttons.push_back(info);
     }
   }
 
   if (options->context_message) {
     optional_fields.context_message =
         base::UTF8ToUTF16(*options->context_message);
   }
 
-  bool has_image = NotificationBitmapToGfxImage(image_scale,
-                                                bitmap_sizes.image_size,
-                                                options->image_bitmap.get(),
+  bool has_image = NotificationBitmapToGfxImage(options->image_bitmap.get(),
                                                 &optional_fields.image);
   // We should have an image if and only if the type is an image type.
-  if (has_image != (type == message_center::NOTIFICATION_TYPE_IMAGE)) {
-    SetError(kExtraImageProvided);
+  if (has_image != (type == message_center::NOTIFICATION_TYPE_IMAGE))
     return false;
-  }
 
   // We should have list items if and only if the type is a multiple type.
   bool has_list_items = options->items.get() && options->items->size() > 0;
-  if (has_list_items != (type == message_center::NOTIFICATION_TYPE_MULTIPLE)) {
-    SetError(kExtraListItemsProvided);
+  if (has_list_items != (type == message_center::NOTIFICATION_TYPE_MULTIPLE))
     return false;
-  }
 
   if (options->progress.get() != NULL) {
     // We should have progress if and only if the type is a progress type.
     if (type != message_center::NOTIFICATION_TYPE_PROGRESS) {
       SetError(kUnexpectedProgressValueForNonProgressType);
       return false;
     }
     optional_fields.progress = *options->progress;
     // Progress value should range from 0 to 100.
     if (optional_fields.progress < 0 || optional_fields.progress > 100) {
@@ skipping 34 matching lines @@
                             api_delegate);
 
   g_browser_process->notification_ui_manager()->Add(notification, GetProfile());
   return true;
 }
 
 bool NotificationsApiFunction::UpdateNotification(
     const std::string& id,
     api::notifications::NotificationOptions* options,
     Notification* notification) {
-  NotificationBitmapSizes bitmap_sizes = GetNotificationBitmapSizes();
-  float image_scale =
-      ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactors().back());
-
   // Update optional fields if provided.
   if (options->type != api::notifications::TEMPLATE_TYPE_NONE)
     notification->set_type(MapApiTemplateTypeToType(options->type));
   if (options->title)
     notification->set_title(base::UTF8ToUTF16(*options->title));
   if (options->message)
     notification->set_message(base::UTF8ToUTF16(*options->message));
 
   // TODO(dewittj): Return error if this fails.
   if (options->icon_bitmap) {
     gfx::Image icon;
-    NotificationBitmapToGfxImage(
-        image_scale, bitmap_sizes.icon_size, options->icon_bitmap.get(), &icon);
+    NotificationBitmapToGfxImage(options->icon_bitmap.get(), &icon);
     notification->set_icon(icon);
   }
 
   if (options->priority)
     notification->set_priority(*options->priority);
 
   if (options->event_time)
     notification->set_timestamp(base::Time::FromJsTime(*options->event_time));
 
   if (options->buttons) {
     // Currently we allow up to 2 buttons.
     size_t number_of_buttons = options->buttons->size();
     number_of_buttons = number_of_buttons > 2 ? 2 : number_of_buttons;
 
     std::vector<message_center::ButtonInfo> buttons;
     for (size_t i = 0; i < number_of_buttons; i++) {
       message_center::ButtonInfo button(
           base::UTF8ToUTF16((*options->buttons)[i]->title));
-      NotificationBitmapToGfxImage(image_scale,
-                                   bitmap_sizes.button_icon_size,
-                                   (*options->buttons)[i]->icon_bitmap.get(),
-                                   &button.icon);
+      NotificationBitmapToGfxImage((*options->buttons)[i]->icon_bitmap.get(),
+                                    &button.icon);
       buttons.push_back(button);
     }
     notification->set_buttons(buttons);
   }
 
   if (options->context_message) {
     notification->set_context_message(
         base::UTF8ToUTF16(*options->context_message));
   }
 
   gfx::Image image;
-  bool has_image = NotificationBitmapToGfxImage(image_scale,
-                                                bitmap_sizes.image_size,
-                                                options->image_bitmap.get(),
-                                                &image);
-  if (has_image) {
+  if (NotificationBitmapToGfxImage(options->image_bitmap.get(), &image)) {
     // We should have an image if and only if the type is an image type.
-    if (notification->type() != message_center::NOTIFICATION_TYPE_IMAGE) {
-      SetError(kExtraImageProvided);
+    if (notification->type() != message_center::NOTIFICATION_TYPE_IMAGE)
       return false;
-    }
     notification->set_image(image);
   }
 
   if (options->progress) {
     // We should have progress if and only if the type is a progress type.
     if (notification->type() != message_center::NOTIFICATION_TYPE_PROGRESS) {
       SetError(kUnexpectedProgressValueForNonProgressType);
       return false;
     }
     int progress = *options->progress;
     // Progress value should range from 0 to 100.
     if (progress < 0 || progress > 100) {
       SetError(kInvalidProgressValue);
       return false;
     }
     notification->set_progress(progress);
   }
 
   if (options->items.get() && options->items->size() > 0) {
     // We should have list items if and only if the type is a multiple type.
-    if (notification->type() != message_center::NOTIFICATION_TYPE_MULTIPLE) {
-      SetError(kExtraListItemsProvided);
+    if (notification->type() != message_center::NOTIFICATION_TYPE_MULTIPLE)
       return false;
-    }
 
     std::vector<message_center::NotificationItem> items;
     using api::notifications::NotificationItem;
     std::vector<linked_ptr<NotificationItem> >::iterator i;
     for (i = options->items->begin(); i != options->items->end(); ++i) {
       message_center::NotificationItem item(
           base::UTF8ToUTF16(i->get()->title),
           base::UTF8ToUTF16(i->get()->message));
       items.push_back(item);
     }
@@ skipping 187 matching lines @@
           ? api::notifications::PERMISSION_LEVEL_GRANTED
           : api::notifications::PERMISSION_LEVEL_DENIED;
 
   SetResult(new base::StringValue(api::notifications::ToString(result)));
   SendResponse(true);
 
   return true;
 }
 
 }  // namespace extensions