Elide origins displayed on web notifications.

chrome/browser/notifications/platform_notification_service_impl.cc

 // Copyright 2014 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/platform_notification_service_impl.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 305 matching lines @@
   return false;
 #endif  // !defined(OS_ANDROID)
 }
 
 Notification PlatformNotificationServiceImpl::CreateNotificationFromData(
     Profile* profile,
     const GURL& origin,
     const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data,
     NotificationDelegate* delegate) const {
-  base::string16 display_source = DisplayNameForOrigin(profile, origin);
-
   // TODO(peter): Icons for Web Notifications are currently always requested for
   // 1x scale, whereas the displays on which they can be displayed can have a
   // different pixel density. Be smarter about this when the API gets updated
   // with a way for developers to specify images of different resolutions.
-  Notification notification(origin, notification_data.title,
-      notification_data.body, gfx::Image::CreateFrom1xBitmap(icon),
-      display_source, notification_data.tag, delegate);
+  Notification notification(
+      origin, notification_data.title, notification_data.body,
+      gfx::Image::CreateFrom1xBitmap(icon), base::UTF8ToUTF16(origin.host()),
+      notification_data.tag, delegate);
 
-  notification.set_context_message(display_source);
+  std::string display_source = DisplayNameForOrigin(profile, origin);
+#if defined(ENABLE_EXTENSIONS)
+  notification.set_context_message(
+      display_source, !origin.SchemeIs(extensions::kExtensionScheme));
+#else
+  notification.set_context_message(display_source, true);
+#endif
   notification.set_vibration_pattern(notification_data.vibration_pattern);
   notification.set_silent(notification_data.silent);
 
   std::vector<message_center::ButtonInfo> buttons;
   for (const auto& action : notification_data.actions)
     buttons.push_back(message_center::ButtonInfo(action.title));
 
   notification.set_buttons(buttons);
 
   // Web Notifications do not timeout.
   notification.set_never_timeout(true);
 
   return notification;
 }
 
 NotificationUIManager*
 PlatformNotificationServiceImpl::GetNotificationUIManager() const {
   if (notification_ui_manager_for_tests_)
     return notification_ui_manager_for_tests_;
 
   return g_browser_process->notification_ui_manager();
 }
 
 void PlatformNotificationServiceImpl::SetNotificationUIManagerForTesting(
     NotificationUIManager* manager) {
   notification_ui_manager_for_tests_ = manager;
 }
 
-base::string16 PlatformNotificationServiceImpl::DisplayNameForOrigin(
+std::string PlatformNotificationServiceImpl::DisplayNameForOrigin(
     Profile* profile,
     const GURL& origin) const {
 #if defined(ENABLE_EXTENSIONS)
   // If the source is an extension, lookup the display name.
   if (origin.SchemeIs(extensions::kExtensionScheme)) {
     const extensions::Extension* extension =
         extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
             origin.host(), extensions::ExtensionRegistry::EVERYTHING);
     DCHECK(extension);
 
-    return base::UTF8ToUTF16(extension->name());
+    return extension->name();
   }
 #endif
 
-  std::string languages =
-      profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
-
-  return WebOriginDisplayName(origin, languages);
+  return origin.spec();
 }
-
-// static
-// TODO(palmer): It might be good to replace this with a call to
-// |FormatUrlForSecurityDisplay|. crbug.com/496965
-base::string16 PlatformNotificationServiceImpl::WebOriginDisplayName(
-    const GURL& origin,
-    const std::string& languages) {
-  if (origin.SchemeIsHTTPOrHTTPS()) {
-    base::string16 formatted_origin;
-    if (origin.SchemeIs(url::kHttpScheme)) {
-      const url::Parsed& parsed = origin.parsed_for_possibly_invalid_spec();
-      const std::string& spec = origin.possibly_invalid_spec();
-      formatted_origin.append(
-          spec.begin(),
-          spec.begin() +
-              parsed.CountCharactersBefore(url::Parsed::USERNAME, true));
-    }
-    formatted_origin.append(
-        url_formatter::IDNToUnicode(origin.host(), languages));
-    if (origin.has_port()) {
-      formatted_origin.push_back(':');
-      formatted_origin.append(base::UTF8ToUTF16(origin.port()));
-    }
-    return formatted_origin;
-  }
-
-  // TODO(dewittj): Once file:// URLs are passed in to the origin
-  // GURL here, begin returning the path as the display name.
-  return url_formatter::FormatUrl(origin, languages);
-}