Display ETLD+1 instead of the full domain in MacOSX native notifications

chrome/browser/notifications/notification_platform_bridge_mac.mm

 // Copyright 2015 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.
 
 #include "chrome/browser/notifications/notification_platform_bridge_mac.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 #import "chrome/browser/ui/cocoa/notifications/notification_delivery.h"
 #import "chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.h"
 #include "chrome/common/features.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/crash/content/app/crashpad.h"
 #include "components/url_formatter/elide_url.h"
+#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationConstants.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 @class NSUserNotification;
 @class NSUserNotificationCenter;
 
 // The mapping from web notifications to NsUserNotification works as follows
@@ skipping 139 matching lines @@
           ? notification.message()
           : (notification.items().at(0).title + base::UTF8ToUTF16(" - ") +
              notification.items().at(0).message);
 
   [builder setContextMessage:base::SysUTF16ToNSString(context_message)];
 
   bool requires_attribution =
       notification.context_message().empty() &&
       notification_type != NotificationCommon::EXTENSION;
 
-  base::string16 subtitle =
+  NSString* subtitle =

[Peter Beverloo, 2017/04/18 13:43:45]

Could we maybe split this out into a helper function too, similar to
CreateNotificationTitle?

[Miguel Garcia, 2017/04/18 14:44:24]

Done.

       requires_attribution
-          ? url_formatter::FormatOriginForSecurityDisplay(
-                url::Origin(notification.origin_url()),
-                url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS)
-          : notification.context_message();
+          ? base::SysUTF8ToNSString(
+                net::registry_controlled_domains::GetDomainAndRegistry(
+                    notification.origin_url(),
+                    net::registry_controlled_domains::
+                        INCLUDE_PRIVATE_REGISTRIES))

[Peter Beverloo, 2017/04/18 13:43:45]

The concern I have with this is that IP addresses would return an empty string.
(That'd be an awesome test case to add.)

I guess we need something like:

if (!requires_attribution) {
  return notification.context_message()
} else {
  if (origin.HostIsIPAddress())
    return FormatOriginForSecurityDisplay()
  else
    return GetDomainAndRegistry()
}

[Miguel Garcia, 2017/04/18 14:44:24]

True, localhost was also affected so I went with a slightly different version.

On 2017/04/18 13:43:45, Peter Beverloo wrote:

+          : base::SysUTF16ToNSString(notification.context_message());
 
-  [builder setSubTitle:base::SysUTF16ToNSString(subtitle)];
+  [builder setSubTitle:subtitle];
   if (!notification.icon().IsEmpty()) {
     [builder setIcon:notification.icon().ToNSImage()];
   }
 
   [builder setShowSettingsButton:(notification_type !=
                                   NotificationCommon::EXTENSION)];
   std::vector<message_center::ButtonInfo> buttons = notification.buttons();
   if (!buttons.empty()) {
     DCHECK_LE(buttons.size(), blink::kWebNotificationMaxActions);
     NSString* buttonOne = SysUTF16ToNSString(buttons[0].title);
@@ skipping 339 matching lines @@
     base::scoped_nsobject<CrXPCMachPort> xpcPort(
         [[CrXPCMachPort alloc] initWithMachSendRight:std::move(exceptionPort)]);
     [proxy setMachExceptionPort:xpcPort];
     setExceptionPort_ = YES;
   }
 
   return proxy;
 }
 
 @end