Refresh for the Chrome notifications image template.

ui/message_center/cocoa/notification_controller.mm

 // 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.
 
 #import "ui/message_center/cocoa/notification_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 178 matching lines @@
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 
 @interface MCNotificationController (Private)
 // Configures a NSBox to be borderless, titleless, and otherwise appearance-
 // free.
 - (void)configureCustomBox:(NSBox*)box;
 
 // Initializes the icon_ ivar and returns the view to insert into the hierarchy.
-- (NSView*)createImageView;
+- (NSView*)createIconView;
+
+// Creates a box that shows a border when the icon is not big enough to fill the
+// space.
+- (NSBox*)createImageBox;
 
 // Initializes the closeButton_ ivar with the configured button.
 - (void)configureCloseButtonInFrame:(NSRect)rootFrame;
 
 // Initializes title_ in the given frame.
 - (void)configureTitleInFrame:(NSRect)rootFrame;
 
 // Initializes message_ in the given frame.
 - (void)configureBodyInFrame:(NSRect)rootFrame;
 
@@ skipping 37 matching lines @@
   NSRect rootFrame = NSMakeRect(0, 0,
       message_center::kNotificationPreferredImageSize,
       message_center::kNotificationIconSize);
   base::scoped_nsobject<MCNotificationView> rootView(
       [[MCNotificationView alloc] initWithController:self frame:rootFrame]);
   [self configureCustomBox:rootView];
   [rootView setFillColor:gfx::SkColorToCalibratedNSColor(
       message_center::kNotificationBackgroundColor)];
   [self setView:rootView];
 
-  [rootView addSubview:[self createImageView]];
+  [rootView addSubview:[self createIconView]];
 
   // Create the close button.
   [self configureCloseButtonInFrame:rootFrame];
   [rootView addSubview:closeButton_];
 
   // Create the title.
   [self configureTitleInFrame:rootFrame];
   [rootView addSubview:title_];
 
   // Create the message body.
@@ skipping 230 matching lines @@
         [[AccessibilityIgnoredBox alloc] initWithFrame:separatorFrame]);
     [self configureCustomBox:separator];
     [separator setFillColor:gfx::SkColorToCalibratedNSColor(
         message_center::kButtonSeparatorColor)];
     y += NSHeight(separatorFrame);
     frame.size.height += NSHeight(separatorFrame);
     [bottomView_ addSubview:separator];
   }
 
   // Create the image view if appropriate.
-  if (!notification->image().IsEmpty()) {
-    NSImage* image = notification->image().AsNSImage();
-    NSRect imageFrame = frame;
-    imageFrame.origin = NSMakePoint(0, y);
-    imageFrame.size = NSSizeFromCGSize(message_center::GetImageSizeForWidth(
-        NSWidth(frame), notification->image().Size()).ToCGSize());
-    base::scoped_nsobject<NSImageView> imageView(
-        [[NSImageView alloc] initWithFrame:imageFrame]);
-    [imageView setImage:image];
-    [imageView setImageScaling:NSImageScaleProportionallyUpOrDown];
-    y += NSHeight(imageFrame);
-    frame.size.height += NSHeight(imageFrame);
-    [bottomView_ addSubview:imageView];
+  gfx::Image notificationImage = notification->image();
+  if (!notificationImage.IsEmpty()) {
+    NSBox* imageBox = [self createImageBox:notificationImage];
+    NSRect outerFrame = frame;
+    outerFrame.origin = NSMakePoint(0, y);
+    outerFrame.size = [imageBox frame].size;
+    [imageBox setFrame:outerFrame];
+
+    y += NSHeight(outerFrame);
+    frame.size.height += NSHeight(outerFrame);
+
+    [bottomView_ addSubview:imageBox];
   }
 
   [bottomView_ setFrame:frame];
   [[self view] addSubview:bottomView_];
 
   rootFrame.size.height += NSHeight(frame);
   titleFrame.origin.y += NSHeight(frame);
   messageFrame.origin.y += NSHeight(frame);
   contextMessageFrame.origin.y += NSHeight(frame);
   listFrame.origin.y += NSHeight(frame);
@@ skipping 46 matching lines @@
 
 // Private /////////////////////////////////////////////////////////////////////
 
 - (void)configureCustomBox:(NSBox*)box {
   [box setBoxType:NSBoxCustom];
   [box setBorderType:NSNoBorder];
   [box setTitlePosition:NSNoTitle];
   [box setContentViewMargins:NSZeroSize];
 }
 
-- (NSView*)createImageView {
+- (NSView*)createIconView {
   // Create another box that shows a background color when the icon is not
   // big enough to fill the space.
   NSRect imageFrame = NSMakeRect(0, 0,
        message_center::kNotificationIconSize,
        message_center::kNotificationIconSize);
   base::scoped_nsobject<NSBox> imageBox(
       [[AccessibilityIgnoredBox alloc] initWithFrame:imageFrame]);
   [self configureCustomBox:imageBox];
   [imageBox setFillColor:gfx::SkColorToCalibratedNSColor(
       message_center::kIconBackgroundColor)];
   [imageBox setAutoresizingMask:NSViewMinYMargin];
 
   // Inside the image box put the actual icon view.
   icon_.reset([[NSImageView alloc] initWithFrame:imageFrame]);
   [imageBox setContentView:icon_];
 
   return imageBox.autorelease();
 }
 
+- (NSBox*)createImageBox:(gfx::Image)notificationImage {
+  using message_center::kNotificationImageBorderSize;
+  using message_center::kNotificationPreferredImageSize;
+  using message_center::kNotificationPreferredImageRatio;
+
+  NSRect imageFrame = NSMakeRect(0, 0,
+       kNotificationPreferredImageSize,
+       kNotificationPreferredImageSize * kNotificationPreferredImageRatio);
+  base::scoped_nsobject<NSBox> imageBox(
+      [[AccessibilityIgnoredBox alloc] initWithFrame:imageFrame]);
+  [self configureCustomBox:imageBox];
+  [imageBox setFillColor:gfx::SkColorToCalibratedNSColor(
+      message_center::kImageBackgroundColor)];
+
+  // Images with non-preferred aspect ratios get a border on all sides.
+  gfx::Size size = notificationImage.Size();
+  int preferredImageHeight = size.width() * kNotificationPreferredImageRatio;
+  if (size.height() != preferredImageHeight) {
+    NSSize borderSize =
+        NSMakeSize(kNotificationImageBorderSize, kNotificationImageBorderSize);
+    [imageBox setContentViewMargins:borderSize];
+  }
+
+  NSImage* image = notificationImage.AsNSImage();
+  base::scoped_nsobject<NSImageView> imageView(
+      [[NSImageView alloc] initWithFrame:imageFrame]);
+  [imageView setImage:image];
+  [imageView setImageScaling:NSImageScaleProportionallyUpOrDown];
+  [imageBox setContentView:imageView];
+
+  return imageBox.autorelease();
+}
+
+

[Robert Sesek, 2013/12/05 18:36:56]

nit: extra line

[dewittj, 2013/12/10 02:47:04]

Done.

 - (void)configureCloseButtonInFrame:(NSRect)rootFrame {
   closeButton_.reset([[HoverImageButton alloc] initWithFrame:NSMakeRect(
       NSMaxX(rootFrame) - message_center::kControlButtonSize,
       NSMaxY(rootFrame) - message_center::kControlButtonSize,
       message_center::kControlButtonSize,
       message_center::kControlButtonSize)]);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   [closeButton_ setDefaultImage:
       rb.GetNativeImageNamed(IDR_NOTIFICATION_CLOSE).ToNSImage()];
   [closeButton_ setHoverImage:
@@ skipping 93 matching lines @@
     if (gfx::GetStringWidth(last, font_list) > width)
       last = gfx::ElideText(last, font_list, width, gfx::ELIDE_AT_END);
     wrapped.resize(lines - 1);
     wrapped.push_back(last);
   }
 
   return lines == 1 ? wrapped[0] : JoinString(wrapped, '\n');
 }
 
 @end