Elide origins displayed on web 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 <algorithm>
 
 #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"
+#include "components/url_formatter/elide_url.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
-
+#include "url/gurl.h"
 
 @interface MCNotificationProgressBar : NSProgressIndicator
 @end
 
 @implementation MCNotificationProgressBar
 - (void)drawRect:(NSRect)dirtyRect {
   NSRect sliceRect, remainderRect;
   double progressFraction = ([self doubleValue] - [self minValue]) /
       ([self maxValue] - [self minValue]);
   NSDivideRect(dirtyRect, &sliceRect, &remainderRect,
@@ skipping 337 matching lines @@
   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.
   size_t actualTitleLines = 0;
-  [title_ setString:base::SysUTF16ToNSString(
-      [self wrapText:notification_->title()
-                forFont:[title_ font]
-       maxNumberOfLines:message_center::kMaxTitleLines
-            actualLines:&actualTitleLines])];
+  [title_ setString:base::SysUTF16ToNSString([self
+                                wrapText:notification_->title()
+                                 forFont:[title_ font]
+                        maxNumberOfLines:message_center::kMaxTitleLines
+                             actualLines:&actualTitleLines])];

[Nico, 2015/08/19 17:58:12]

Huh, is this what clang-format does? The formatting on the left looks more like
how this usually looks. But if this is clang-format I suppose the new formatting
is fine too.

[Miguel Garcia, 2015/08/19 19:52:46]

Acknowledged.

   [title_ sizeToFit];
   NSRect titleFrame = [title_ frame];
   titleFrame.origin.y = NSMaxY(rootFrame) - titlePadding - NSHeight(titleFrame);
 
   // The number of message lines depends on the number of context message lines
   // and the lines within the title, and whether an image exists.
   int messageLineLimit = message_center::kMessageExpandedLineLimit;
   if (actualTitleLines > 1)
     messageLineLimit -= (actualTitleLines - 1) * 2;
   if (!notification_->image().IsEmpty()) {
     messageLineLimit /= 2;
-    if (!notification_->context_message().empty())
+
+    if (!notification_->context_message().empty() &&
+        ![self useOriginAsContextMessage:notification])
       messageLineLimit -= message_center::kContextMessageLineLimit;
   }
   if (messageLineLimit < 0)
     messageLineLimit = 0;
 
   // Set the message and recalculate the frame.
   [message_ setString:base::SysUTF16ToNSString(
       [self wrapText:notification_->message()
              forFont:[message_ font]
       maxNumberOfLines:messageLineLimit])];
@@ skipping 11 matching lines @@
     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_ setString:base::SysUTF16ToNSString(
-      [self wrapText:notification_->context_message()
-             forFont:[contextMessage_ font]
-       maxNumberOfLines:message_center::kContextMessageLineLimit])];
+  base::string16 message;
+  if ([self useOriginAsContextMessage:notification]) {
+    gfx::FontList font_list((gfx::Font([message_ font])));
+    message =
+        url_formatter::ElideHost(notification->origin_url(), font_list,
+                                 message_center::kContextMessageViewWidth);
+  } else {
+    message = notification_->context_message();
+  }
+
+  [contextMessage_
+      setString:
+          base::SysUTF16ToNSString([self
+                      wrapText:message
+                       forFont:[contextMessage_ font]
+              maxNumberOfLines:message_center::kContextMessageLineLimit])];

[Nico, 2015/08/19 17:58:11]

This might look a bit less awkward with a temp variable.

(base::string16 elided = [self wrapText:message forFont:[contextMessage_ font];
 [contextMessage_ setString:base::Sys...)

[Miguel Garcia, 2015/08/19 19:52:46]

Done.

   [contextMessage_ sizeToFit];
   NSRect contextMessageFrame = [contextMessage_ frame];
 
-  if (notification_->context_message().empty()) {
+  if (notification_->context_message().empty() &&
+      ![self useOriginAsContextMessage:notification]) {
     [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]);
@@ skipping 186 matching lines @@
   [[self view] setFrame:rootFrame];
   [title_ setFrame:titleFrame];
   [message_ setFrame:messageFrame];
   [contextMessage_ setFrame:contextMessageFrame];
   [listView_ setFrame:listFrame];
   [progressBarView_ setFrame:progressBarFrame];
 
   return rootFrame;
 }
 
+- (bool)useOriginAsContextMessage:
+    (const message_center::Notification*)notification {
+  return (notification->context_message().empty() &&
+          notification->origin_url().is_valid() &&
+          notification->origin_url().SchemeIsHTTPOrHTTPS());

[Nico, 2015/08/19 17:58:12]

This kind of looks like model code; why isn't this code in a method on
Notification?

[Jun Mukai, 2015/08/19 18:06:02]

+1 (to be clear, I objected the idea to introduce a boolean flag for this, but
adding a method like this looks good to me).

[Miguel Garcia, 2015/08/19 19:52:46]

Done

On 2015/08/19 18:06:02, Jun Mukai wrote:

+}
+
 - (void)close:(id)sender {
   [closeButton_ setTarget:nil];
   messageCenter_->RemoveNotification([self notificationID], /*by_user=*/true);
 }
 
 - (void)buttonClicked:(id)button {
   messageCenter_->ClickOnNotificationButton([self notificationID],
                                             [button tag]);
 }
 
@@ skipping 236 matching lines @@
                    forFont:(NSFont*)nsfont
           maxNumberOfLines:(size_t)lines {
   size_t unused;
   return [self wrapText:text
                 forFont:nsfont
        maxNumberOfLines:lines
             actualLines:&unused];
 }
 
 @end