Update notification style: allow 2-line titles if the message is blank.

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 <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_util.h"
@@ skipping 325 matching lines @@
   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_ setString:base::SysUTF16ToNSString(
-      [self wrapText:notification_->title()
-             forFont:[title_ font]
-       maxNumberOfLines:message_center::kTitleLineLimit])];
+  int titleLineLimit = notification_->message().empty()
+                           ? message_center::kTitleNoMessageLineLimit
+                           : message_center::kTitleLineLimit;
+  [title_
+      setString:base::SysUTF16ToNSString([self wrapText:notification_->title()

[Robert Sesek, 2014/04/28 20:49:28]

You probably clang-formatted this, but it looks wrong. It should break like it
used to.

In fact, this is just churn for the sake of churn. You're changing the value of
one param, the diff includes 3 extra lines.

[dewittj, 2014/04/28 21:05:32]

Done.

This is not actually churn just for the sake of churn.  Once changed to match
clang-format, no more churn will happen and formatting becomes completely a
non-issue.  I think the objective-c formatting could probably use some tweaking.

[Robert Sesek, 2014/04/28 21:07:29]

Yeah, I think the ObjC formatter is less-tested/used than the C++ one.

+                                                forFont:[title_ font]
+                                       maxNumberOfLines:titleLineLimit])];
   [title_ sizeToFit];
   NSRect titleFrame = [title_ frame];
   titleFrame.origin.y = NSMaxY(rootFrame) - titlePadding - NSHeight(titleFrame);
 
   // Set the message and recalculate the frame.
   [message_ setString:base::SysUTF16ToNSString(
       [self wrapText:notification_->message()
              forFont:[message_ font]
        maxNumberOfLines:message_center::kMessageExpandedLineLimit])];
   [message_ sizeToFit];
   NSRect messageFrame = [message_ frame];
 
   // If there are list items, then the message_ view should not be displayed.
   const std::vector<message_center::NotificationItem>& items =
       notification->items();
-  if (items.size() > 0) {
+  // If there are list items, don't show the main message.  Also if the message
+  // is empty, mark it as hidden and set 0 hight, so it doesn't take up any

[Robert Sesek, 2014/04/28 20:49:28]

nit: height

[dewittj, 2014/04/28 21:05:32]

Done.

+  // space (size to fit leaves it 15 px tall.
+  if (items.size() > 0 || notification_->message().empty()) {
     [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]);
   }
 
@@ skipping 431 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