Made WebKit notifications display 80x80 icons if they have them.

ui/message_center/views/notification_view.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 "ui/message_center/views/notification_view.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/message_center_switches.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_change_observer.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/bounded_label.h"
 #include "ui/message_center/views/message_simple_view.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
+#include "ui/views/widget/widget.h"
 
 namespace {
 
 // Dimensions.
-const int kIconColumnWidth = message_center::kNotificationIconSize;
+const int kIconSize = message_center::kNotificationIconSize;
 const int kLegacyIconSize = 40;
-const int kTextLeftPadding = kIconColumnWidth +
-                             message_center::kIconToTextPadding;
+const int kTextLeftPadding = kIconSize + message_center::kIconToTextPadding;
 const int kTextBottomPadding = 12;
 const int kTextRightPadding = 23;
 const int kItemTitleToMessagePadding = 3;
 const int kButtonHeight = 38;
 const int kButtonHorizontalPadding = 16;
 const int kButtonVecticalPadding = 0;
 const int kButtonIconTopPadding = 11;
 const int kButtonIconToTitlePadding = 16;
 const int kButtonTitleTopPadding = 0;
 
@@ skipping 33 matching lines @@
 // static
 views::Border* MakeTextBorder(int top, int bottom) {
   return MakeEmptyBorder(top, kTextLeftPadding, bottom, kTextRightPadding);
 }
 
 // static
 views::Border* MakeSeparatorBorder(int top, int left, SkColor color) {
   return views::Border::CreateSolidSidedBorder(top, left, 0, 0, color);
 }
 
+// static
+// Return true if and only if the image is null or has alpha.
+bool HasAlpha(gfx::ImageSkia& image, views::Widget* widget) {
+  // Determine which bitmap to use.
+  ui::ScaleFactor factor = ui::SCALE_FACTOR_100P;
+  if (widget) {
+    factor = ui::GetScaleFactorForNativeView(widget->GetNativeView());
+    if (factor == ui::SCALE_FACTOR_NONE)
+      factor = ui::SCALE_FACTOR_100P;
+  }
+
+  // Extract that bitmap's alpha and look for a non-opaque pixel there.
+  SkBitmap bitmap = image.GetRepresentation(factor).sk_bitmap();
+  if (!bitmap.isNull()) {
+    SkBitmap alpha;
+    alpha.setConfig(SkBitmap::kA1_Config, bitmap.width(), bitmap.height(), 0);
+    bitmap.extractAlpha(&alpha);
+    for (int y = 0; y < bitmap.height(); ++y) {
+      for (int x = 0; x < bitmap.width(); ++x) {
+        if (alpha.getColor(x, y) != SK_ColorBLACK) {
+          return true;
+        }
+      }
+    }
+  }
+
+  // If no opaque pixel was found, return false unless the bitmap is empty.
+  return bitmap.isNull();
+}
+
 // ItemView ////////////////////////////////////////////////////////////////////
 
 // ItemViews are responsible for drawing each list notification item's title and
 // message next to each other within a single column.
 class ItemView : public views::View {
  public:
   ItemView(const message_center::NotificationItem& item);
   virtual ~ItemView();
 
   virtual void SetVisible(bool visible) OVERRIDE;
@@ skipping 278 matching lines @@
   std::vector<NotificationItem> items = notification.items();
   for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
     ItemView* item_view = new ItemView(items[i]);
     item_view->SetVisible(is_expanded());
     item_view->set_border(MakeTextBorder(i > 0 ? 0 : 4, 1));
     item_views_.push_back(item_view);
     top_view_->AddChildView(item_view);
   }
 
   // Create the notification icon view.
-  if (notification.type() == NOTIFICATION_TYPE_SIMPLE) {
+  gfx::ImageSkia icon = notification.icon().AsImageSkia();
+  if (notification.type() == NOTIFICATION_TYPE_SIMPLE &&
+         (icon.width() != kIconSize ||
+             icon.height() != kIconSize ||
+             HasAlpha(icon, GetWidget()))) {

[Jun Mukai, 2013/04/12 18:50:21]

nit: align the indent

[dharcourt, 2013/04/12 19:21:07]

Should this be aligned this way (#1):

    if (notification.type() == NOTIFICATION_TYPE_SIMPLE &&
        (icon.width() != kIconSize ||
         icon.height() != kIconSize ||
         HasAlpha(icon, GetWidget()))) {

...or that way (#2):

    if (notification.type() == NOTIFICATION_TYPE_SIMPLE &&
           (icon.width() != kIconSize ||
           icon.height() != kIconSize ||
           HasAlpha(icon, GetWidget()))) {

...or another way (#3)? I haven't found a specific reference to this in the
style guide.

[Jun Mukai, 2013/04/12 19:34:38]

#1 is in my mind.

[dharcourt, 2013/04/12 20:09:56]

Lucky me, that's what I uploaded :-).

     views::ImageView* icon_view = new views::ImageView();
-    icon_view->SetImage(notification.icon().AsImageSkia());
+    icon_view->SetImage(icon);
     icon_view->SetImageSize(gfx::Size(kLegacyIconSize, kLegacyIconSize));
     icon_view->SetHorizontalAlignment(views::ImageView::CENTER);
     icon_view->SetVerticalAlignment(views::ImageView::CENTER);
     icon_view->set_background(MakeBackground(kLegacyIconBackgroundColor));
     icon_view_ = icon_view;
   } else {
-    icon_view_ = new ProportionalImageView(notification.icon().AsImageSkia());
+    icon_view_ = new ProportionalImageView(icon);
   }
 
   // Create the bottom_view_, which collects into a vertical box all content
   // below the notification icon except for the expand button.
   bottom_view_ = new views::View();
   bottom_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
   // Create the image view if appropriate.
   image_view_ = NULL;
@@ skipping 36 matching lines @@
   int top_width = top_view_->GetPreferredSize().width();
   int bottom_width = bottom_view_->GetPreferredSize().width();
   int preferred_width = std::max(top_width, bottom_width) + GetInsets().width();
   return gfx::Size(preferred_width, GetHeightForWidth(preferred_width));
 }
 
 int NotificationView::GetHeightForWidth(int width) {
   gfx::Insets insets = GetInsets();
   int top_height = top_view_->GetHeightForWidth(width - insets.width());
   int bottom_height = bottom_view_->GetHeightForWidth(width - insets.width());
-  int icon_size = message_center::kNotificationIconSize;
-  return std::max(top_height, icon_size) + bottom_height + insets.height();
+  return std::max(top_height, kIconSize) + bottom_height + insets.height();
 }
 
 void NotificationView::Layout() {
   gfx::Insets insets = GetInsets();
   int content_width = width() - insets.width();
   int content_right = width() - insets.right();
 
   // Before any resizing, set or adjust the number of message lines.
   if (message_view_)
     message_view_->SetLineLimit(GetMessageLineLimit());
 
   // Background.
   background_view_->SetBounds(insets.left(), insets.top(),
                               content_width, height() - insets.height());
 
   // Top views.
   int top_height = top_view_->GetHeightForWidth(content_width);
   top_view_->SetBounds(insets.left(), insets.top(), content_width, top_height);
 
   // Icon.
-  int icon_size = message_center::kNotificationIconSize;
-  icon_view_->SetBounds(insets.left(), insets.top(), icon_size, icon_size);
+  icon_view_->SetBounds(insets.left(), insets.top(), kIconSize, kIconSize);
 
   // Bottom views.
-  int bottom_y = insets.top() + std::max(top_height, icon_size);
+  int bottom_y = insets.top() + std::max(top_height, kIconSize);
   int bottom_height = bottom_view_->GetHeightForWidth(content_width);
   bottom_view_->SetBounds(insets.left(), bottom_y,
                           content_width, bottom_height);
 
   // Close button.
   gfx::Size close_size(close_button()->GetPreferredSize());
   close_button()->SetBounds(content_right - close_size.width(), insets.top(),
                             close_size.width(), close_size.height());
 
   // Expand button.
@@ skipping 54 matching lines @@
 
   // If there's a title ensure title + message lines <= collapsed line limit.
   if (title_view_)
     return kMessageCollapsedLineLimit - title_view_->GetLinesForWidth(width());
 
   // If there's no title we get an extra line because message lines are shorter.
   return kMessageCollapsedLineLimit + 1;
 }
 
 }  // namespace message_center