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

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 182 matching lines @@
 @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*)createIconView;
 
 // Creates a box that shows a border when the icon is not big enough to fill the
 // space.
-- (NSBox*)createImageBox;
+- (NSBox*)createImageBox:(const gfx::Image&)notificationImage;
 
 // Initializes the closeButton_ ivar with the configured button.
 - (void)configureCloseButtonInFrame:(NSRect)rootFrame;
 
+// Initializes the smallImage_ ivar with the appropriate frame.
+- (void)configureSmallImageInFrame:(NSRect)rootFrame;
+
 // Initializes title_ in the given frame.
 - (void)configureTitleInFrame:(NSRect)rootFrame;
 
 // Initializes message_ in the given frame.
 - (void)configureBodyInFrame:(NSRect)rootFrame;
 
 // Initializes contextMessage_ in the given frame.
 - (void)configureContextMessageInFrame:(NSRect)rootFrame;
 
 // Creates a NSTextView that the caller owns configured as a label in a
 // notification.
 - (NSTextView*)newLabelWithFrame:(NSRect)frame;
 
 // Gets the rectangle in which notification content should be placed. This
 // rectangle is to the right of the icon and left of the control buttons.
 // This depends on the icon_ and closeButton_ being initialized.
 - (NSRect)currentContentRect;
 
 // Returns the wrapped text that could fit within the content rect with not
 // more than the given number of lines. The wrapped text would be painted using
 // the given font. The Ellipsis could be added at the end of the last line if
 // it is too long.
 - (base::string16)wrapText:(const base::string16&)text
                    forFont:(NSFont*)font
-    maxNumberOfLines:(size_t)lines;
+          maxNumberOfLines:(size_t)lines;
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 
 @implementation MCNotificationController
 
 - (id)initWithNotification:(const message_center::Notification*)notification
     messageCenter:(message_center::MessageCenter*)messageCenter {
   if ((self = [super initWithNibName:nil bundle:nil])) {
     notification_ = notification;
@@ skipping 14 matching lines @@
   [rootView setFillColor:gfx::SkColorToCalibratedNSColor(
       message_center::kNotificationBackgroundColor)];
   [self setView:rootView];
 
   [rootView addSubview:[self createIconView]];
 
   // Create the close button.
   [self configureCloseButtonInFrame:rootFrame];
   [rootView addSubview:closeButton_];
 
+  [self configureSmallImageInFrame:rootFrame];
+  [[self view] addSubview:smallImage_];
+
   // Create the title.
   [self configureTitleInFrame:rootFrame];
   [rootView addSubview:title_];
 
   // Create the message body.
   [self configureBodyInFrame:rootFrame];
   [rootView addSubview:message_];
 
   // Create the context message body.
   [self configureContextMessageInFrame:rootFrame];
   [rootView addSubview:contextMessage_];
 
   // Populate the data.
   [self updateNotification:notification_];
 }
 
 - (NSRect)updateNotification:(const message_center::Notification*)notification {
   DCHECK_EQ(notification->id(), notificationID_);
   notification_ = notification;
 
   NSRect rootFrame = NSMakeRect(0, 0,
       message_center::kNotificationPreferredImageWidth,
       message_center::kNotificationIconSize);
 
+  [smallImage_ setImage:notification_->small_image().AsNSImage()];
+
   // Update the icon.
   [icon_ setImage:notification_->icon().AsNSImage()];
 
   // The message_center:: constants are relative to capHeight at the top and
   // relative to the baseline at the bottom, but NSTextField uses the full line
   // height for its height.
   CGFloat titleTopGap =
       roundf([[title_ font] ascender] - [[title_ font] capHeight]);
   CGFloat titleBottomGap = roundf(fabs([[title_ font] descender]));
   CGFloat titlePadding = message_center::kTextTopPadding - titleTopGap;
@@ skipping 299 matching lines @@
       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 {
+- (NSBox*)createImageBox:(const gfx::Image&)notificationImage {
   using message_center::kNotificationImageBorderSize;
   using message_center::kNotificationPreferredImageWidth;
   using message_center::kNotificationPreferredImageHeight;
 
   NSRect imageFrame = NSMakeRect(0, 0,
        kNotificationPreferredImageWidth,
        kNotificationPreferredImageHeight);
   base::scoped_nsobject<NSBox> imageBox(
       [[AccessibilityIgnoredBox alloc] initWithFrame:imageFrame]);
   [self configureCustomBox:imageBox];
@@ skipping 15 matching lines @@
   base::scoped_nsobject<NSImageView> imageView(
       [[NSImageView alloc] initWithFrame:imageFrame]);
   [imageView setImage:image];
   [imageView setImageScaling:NSImageScaleProportionallyUpOrDown];
   [imageBox setContentView:imageView];
 
   return imageBox.autorelease();
 }
 
 - (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)]);
+  // The close button is configured to be the same size as the small image.
+  int closeButtonOriginOffset =
+      message_center::kSmallImageSize + message_center::kSmallImagePadding;
+  NSRect closeButtonFrame =
+      NSMakeRect(NSMaxX(rootFrame) - closeButtonOriginOffset,
+                 NSMaxY(rootFrame) - closeButtonOriginOffset,
+                 message_center::kSmallImageSize,
+                 message_center::kSmallImageSize);
+  closeButton_.reset([[HoverImageButton alloc] initWithFrame:closeButtonFrame]);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   [closeButton_ setDefaultImage:
       rb.GetNativeImageNamed(IDR_NOTIFICATION_CLOSE).ToNSImage()];
   [closeButton_ setHoverImage:
       rb.GetNativeImageNamed(IDR_NOTIFICATION_CLOSE_HOVER).ToNSImage()];
   [closeButton_ setPressedImage:
       rb.GetNativeImageNamed(IDR_NOTIFICATION_CLOSE_PRESSED).ToNSImage()];
   [[closeButton_ cell] setHighlightsBy:NSOnState];
   [closeButton_ setTrackingEnabled:YES];
   [closeButton_ setBordered:NO];
   [closeButton_ setAutoresizingMask:NSViewMinYMargin];
   [closeButton_ setTarget:self];
   [closeButton_ setAction:@selector(close:)];
   [[closeButton_ cell]
       accessibilitySetOverrideValue:NSAccessibilityCloseButtonSubrole
                        forAttribute:NSAccessibilitySubroleAttribute];
   [[closeButton_ cell]
       accessibilitySetOverrideValue:
           l10n_util::GetNSString(IDS_APP_ACCNAME_CLOSE)
                        forAttribute:NSAccessibilityTitleAttribute];
 }
 
+- (void)configureSmallImageInFrame:(NSRect)rootFrame {
+  int smallImageXOffset =
+      message_center::kSmallImagePadding + message_center::kSmallImageSize;
+  NSRect smallImageFrame =
+      NSMakeRect(NSMaxX(rootFrame) - smallImageXOffset,
+                 NSMinY(rootFrame) + message_center::kSmallImagePadding,
+                 message_center::kSmallImageSize,
+                 message_center::kSmallImageSize);
+  smallImage_.reset([[NSImageView alloc] initWithFrame:smallImageFrame]);
+  [smallImage_ setImageScaling:NSImageScaleProportionallyUpOrDown];
+  [smallImage_ setAutoresizingMask:NSViewMinYMargin];
+}
+
 - (void)configureTitleInFrame:(NSRect)rootFrame {
   NSRect frame = [self currentContentRect];
   frame.size.height = 0;
   title_.reset([self newLabelWithFrame:frame]);
   [title_ setAutoresizingMask:NSViewMinYMargin];
   [title_ setTextColor:gfx::SkColorToCalibratedNSColor(
       message_center::kRegularTextColor)];
   [title_ setFont:[NSFont messageFontOfSize:message_center::kTitleFontSize]];
 }
 
@@ skipping 66 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