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 70 matching lines @@
 base::string16 CreateNotificationTitle(const Notification& notification) {
   base::string16 title;
   if (notification.progress() > 0) {
     title += base::FormatPercent(notification.progress());
     title += base::UTF8ToUTF16(" - ");
   }
   title += notification.title();
   return title;
 }
 
+base::string16 CreateNotificationContext(
+    const Notification& notification,
+    NotificationCommon::Type notification_type) {

[Peter Beverloo, 2017/04/18 14:48:54]

nit: I'd prefer to pass in `requires_attribution` as an argument as opposed to
`notification_type`. Keeps such type-based decisions together.

[Miguel Garcia, 2017/04/18 14:59:10]

Done.

+  bool requires_attribution =
+      notification.context_message().empty() &&
+      notification_type != NotificationCommon::EXTENSION;
+  if (!requires_attribution)
+    return notification.context_message();
+
+  base::string16 context =
+      base::UTF8ToUTF16(net::registry_controlled_domains::GetDomainAndRegistry(
+          notification.origin_url(),
+          net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
+
+  // localhost, raw IPs etc. are not handled by GetDomainAndRegistry

[Peter Beverloo, 2017/04/18 14:48:54]

Maybe explicitly refer the reader to the GetDomainAndRegistry() documentation
for these edge-cases, instead of repeating them? Also a period to finish the
sentence.

[Miguel Garcia, 2017/04/18 14:59:10]

Added the period at the end.  I kind of like having a few examples right here
and GetDomainAndRegistry does not seem to talk about localhost apparently

+  if (context.empty()) {
+    context = url_formatter::FormatOriginForSecurityDisplay(
+        url::Origin(notification.origin_url()),
+        url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS);
+  }
+
+  return context;
+}
 }  // namespace
 
 // A Cocoa class that represents the delegate of NSUserNotificationCenter and
 // can forward commands to C++.
 @interface NotificationCenterDelegate
     : NSObject<NSUserNotificationCenterDelegate> {
 }
 @end
 
 // Interface to communicate with the Alert XPC service.
@@ skipping 45 matching lines @@
       setTitle:base::SysUTF16ToNSString(CreateNotificationTitle(notification))];
 
   base::string16 context_message =
       notification.items().empty()
           ? 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;
+  [builder setSubTitle:base::SysUTF16ToNSString(CreateNotificationContext(
+                           notification, notification_type))];
 
-  base::string16 subtitle =
-      requires_attribution
-          ? url_formatter::FormatOriginForSecurityDisplay(
-                url::Origin(notification.origin_url()),
-                url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS)
-          : notification.context_message();
-
-  [builder setSubTitle:base::SysUTF16ToNSString(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