Revert 220500 "Adds the contextMessage field to notifications."

trunk/src/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 185 matching lines @@
 
 // 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;
 
-// Initializes contextMessage_ in the given frame.
-- (void)configureContextMessageInFrame:(NSRect)rootFrame;
-
 // Creates a NSTextField that the caller owns configured as a label in a
 // notification.
 - (NSTextField*)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 given text field with not
@@ skipping 37 matching lines @@
   [rootView addSubview:closeButton_];
 
   // 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::kNotificationPreferredImageSize,
       message_center::kNotificationIconSize);
 
   // 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;
 
   CGFloat messageTopGap =
       roundf([[message_ font] ascender] - [[message_ font] capHeight]);
-  CGFloat messageBottomGap = roundf(fabs([[message_ font] descender]));
   CGFloat messagePadding =
       message_center::kTextTopPadding - titleBottomGap - messageTopGap;
 
-  CGFloat contextMessageTopGap = roundf(
-      [[contextMessage_ font] ascender] - [[contextMessage_ font] capHeight]);
-  CGFloat contextMessagePadding =
-      message_center::kTextTopPadding - messageBottomGap - contextMessageTopGap;
-
   // Set the title and recalculate the frame.
   [title_ setStringValue:base::SysUTF16ToNSString(
       [self wrapText:notification_->title()
             forField:title_
        maxNumberOfLines:message_center::kTitleLineLimit])];
   [title_ sizeToFit];
   NSRect titleFrame = [title_ frame];
   titleFrame.origin.y = NSMaxY(rootFrame) - titlePadding - NSHeight(titleFrame);
 
   // Set the message and recalculate the frame.
   [message_ setStringValue:base::SysUTF16ToNSString(
       [self wrapText:notification_->message()
-            forField:message_
+            forField:title_
        maxNumberOfLines:message_center::kMessageExpandedLineLimit])];
+  [message_ setHidden:NO];
   [message_ sizeToFit];
   NSRect messageFrame = [message_ frame];
+  messageFrame.origin.y =
+      NSMinY(titleFrame) - messagePadding - NSHeight(messageFrame);
+  messageFrame.size.height = NSHeight([message_ frame]);
 
-  // If there are list items, then the message_ view should not be displayed.
+  // Create the list item views (up to a maximum).
+  [listItemView_ removeFromSuperview];
   const std::vector<message_center::NotificationItem>& items =
       notification->items();
+  NSRect listFrame = NSZeroRect;
   if (items.size() > 0) {
+    // If there are list items, then the message_ view should not be displayed.
     [message_ setHidden:YES];
     messageFrame.origin.y = titleFrame.origin.y;
     messageFrame.size.height = 0;
-  } else {
-    [message_ setHidden:NO];
-    messageFrame.origin.y =
-        NSMinY(titleFrame) - messagePadding - NSHeight(messageFrame);
-    messageFrame.size.height = NSHeight([message_ frame]);
-  }
 
-  // Set the context message and recalculate the frame.
-  [contextMessage_ setStringValue:base::SysUTF16ToNSString(
-      [self wrapText:notification_->context_message()
-            forField:contextMessage_
-       maxNumberOfLines:message_center::kContextMessageLineLimit])];
-  [contextMessage_ sizeToFit];
-  NSRect contextMessageFrame = [contextMessage_ frame];
-
-  if (notification_->context_message().empty()) {
-    [contextMessage_ setHidden:YES];
-    contextMessageFrame.origin.y = messageFrame.origin.y;
-    contextMessageFrame.size.height = 0;
-  } else {
-    [contextMessage_ setHidden:NO];
-    contextMessageFrame.origin.y =
-        NSMinY(messageFrame) -
-        contextMessagePadding -
-        NSHeight(contextMessageFrame);
-    contextMessageFrame.size.height = NSHeight([contextMessage_ frame]);
-  }
-
-  // Create the list item views (up to a maximum).
-  [listItemView_ removeFromSuperview];
-  NSRect listFrame = NSZeroRect;
-  if (items.size() > 0) {
     listFrame = [self currentContentRect];
     listFrame.origin.y = 0;
     listFrame.size.height = 0;
     listItemView_.reset([[NSView alloc] initWithFrame:listFrame]);
     [listItemView_ accessibilitySetOverrideValue:NSAccessibilityListRole
                                     forAttribute:NSAccessibilityRoleAttribute];
     [listItemView_
         accessibilitySetOverrideValue:NSAccessibilityContentListSubrole
                          forAttribute:NSAccessibilitySubroleAttribute];
     CGFloat y = 0;
 
     NSFont* font = [NSFont systemFontOfSize:message_center::kMessageFontSize];
     CGFloat lineHeight = roundf(NSHeight([font boundingRectForFont]));
 
     const int kNumNotifications =
         std::min(items.size(), message_center::kNotificationMaximumItems);
     for (int i = kNumNotifications - 1; i >= 0; --i) {
       NSTextField* field = [self newLabelWithFrame:
           NSMakeRect(0, y, NSWidth(listFrame), lineHeight)];
       [[field cell] setUsesSingleLineMode:YES];
       [field setAttributedStringValue:
           [MCNotificationController attributedStringForItem:items[i]
                                                        font:font]];
       [listItemView_ addSubview:field];
       y += lineHeight;
     }
     // TODO(thakis): The spacing is not completely right.
     CGFloat listTopPadding =
-        message_center::kTextTopPadding - contextMessageTopGap;
+        message_center::kTextTopPadding - messageTopGap;
     listFrame.size.height = y;
     listFrame.origin.y =
-        NSMinY(contextMessageFrame) - listTopPadding - NSHeight(listFrame);
+        NSMinY(titleFrame) - listTopPadding - NSHeight(listFrame);
     [listItemView_ setFrame:listFrame];
     [[self view] addSubview:listItemView_];
   }
 
   // Create the progress bar view if needed.
   [progressBarView_ removeFromSuperview];
   NSRect progressBarFrame = NSZeroRect;
   if (notification->type() == message_center::NOTIFICATION_TYPE_PROGRESS) {
     progressBarFrame = [self currentContentRect];
-    progressBarFrame.origin.y = NSMinY(contextMessageFrame) -
+    progressBarFrame.origin.y = NSMinY(messageFrame) -
         message_center::kProgressBarTopPadding -
         message_center::kProgressBarThickness;
     progressBarFrame.size.height = message_center::kProgressBarThickness;
     progressBarView_.reset(
         [[MCNotificationProgressBar alloc] initWithFrame:progressBarFrame]);
     // Setting indeterminate to NO does not work with custom drawRect.
     [progressBarView_ setIndeterminate:YES];
     [progressBarView_ setStyle:NSProgressIndicatorBarStyle];
     [progressBarView_ setDoubleValue:notification->progress()];
     [[self view] addSubview:progressBarView_];
   }
 
   // If the bottom-most element so far is out of the rootView's bounds, resize
   // the view.
-  CGFloat minY = NSMinY(contextMessageFrame);
+  CGFloat minY = NSMinY(messageFrame);
   if (listItemView_ && NSMinY(listFrame) < minY)
     minY = NSMinY(listFrame);
   if (progressBarView_ && NSMinY(progressBarFrame) < minY)
     minY = NSMinY(progressBarFrame);
   if (minY < messagePadding) {
     CGFloat delta = messagePadding - minY;
     rootFrame.size.height += delta;
     titleFrame.origin.y += delta;
     messageFrame.origin.y += delta;
-    contextMessageFrame.origin.y += delta;
     listFrame.origin.y += delta;
     progressBarFrame.origin.y += delta;
   }
 
   // Add the bottom container view.
   NSRect frame = rootFrame;
   frame.size.height = 0;
   [bottomView_ removeFromSuperview];
   bottomView_.reset([[NSView alloc] initWithFrame:frame]);
   CGFloat y = 0;
@@ skipping 50 matching lines @@
     frame.size.height += NSHeight(imageFrame);
     [bottomView_ addSubview:imageView];
   }
 
   [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);
   progressBarFrame.origin.y += NSHeight(frame);
 
   // Make sure that there is a minimum amount of spacing below the icon and
   // the edge of the frame.
   CGFloat bottomDelta = NSHeight(rootFrame) - NSHeight([icon_ frame]);
   if (bottomDelta > 0 && bottomDelta < message_center::kIconBottomPadding) {
     CGFloat bottomAdjust = message_center::kIconBottomPadding - bottomDelta;
     rootFrame.size.height += bottomAdjust;
     titleFrame.origin.y += bottomAdjust;
     messageFrame.origin.y += bottomAdjust;
-    contextMessageFrame.origin.y += bottomAdjust;
     listFrame.origin.y += bottomAdjust;
     progressBarFrame.origin.y += bottomAdjust;
   }
 
   [[self view] setFrame:rootFrame];
   [title_ setFrame:titleFrame];
   [message_ setFrame:messageFrame];
-  [contextMessage_ setFrame:contextMessageFrame];
   [listItemView_ setFrame:listFrame];
   [progressBarView_ setFrame:progressBarFrame];
 
   return rootFrame;
 }
 
 - (void)close:(id)sender {
   [closeButton_ setTarget:nil];
   messageCenter_->RemoveNotification([self notificationID], /*by_user=*/true);
 }
@@ skipping 117 matching lines @@
       message_center::kRegularTextColor)];
   [title_ setFont:[NSFont messageFontOfSize:message_center::kTitleFontSize]];
 }
 
 - (void)configureBodyInFrame:(NSRect)rootFrame {
   NSRect frame = [self currentContentRect];
   frame.size.height = 0;
   message_.reset([self newLabelWithFrame:frame]);
   [message_ setAutoresizingMask:NSViewMinYMargin];
   [message_ setTextColor:gfx::SkColorToCalibratedNSColor(
-      message_center::kRegularTextColor)];
+      message_center::kDimTextColor)];
   [message_ setFont:
       [NSFont messageFontOfSize:message_center::kMessageFontSize]];
 }
 
-- (void)configureContextMessageInFrame:(NSRect)rootFrame {
-  NSRect frame = [self currentContentRect];
-  frame.size.height = 0;
-  contextMessage_.reset([self newLabelWithFrame:frame]);
-  [contextMessage_ setAutoresizingMask:NSViewMinYMargin];
-  [contextMessage_ setTextColor:gfx::SkColorToCalibratedNSColor(
-      message_center::kDimTextColor)];
-  [contextMessage_ setFont:
-      [NSFont messageFontOfSize:message_center::kMessageFontSize]];
-}
-
 - (NSTextField*)newLabelWithFrame:(NSRect)frame {
   NSTextField* label = [[NSTextField alloc] initWithFrame:frame];
   [label setDrawsBackground:NO];
   [label setBezeled:NO];
   [label setEditable:NO];
   [label setSelectable:NO];
   return label;
 }
 
 - (NSRect)currentContentRect {
@@ skipping 26 matching lines @@
     if (font.GetStringWidth(last) > width)
       last = ui::ElideText(last, font, width, ui::ELIDE_AT_END);
     wrapped.resize(lines - 1);
     wrapped.push_back(last);
   }
 
   return JoinString(wrapped, '\n');
 }
 
 @end