Adds a context message of the security origin for web notifications.

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2012 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/desktop_notification_service.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/show_desktop_notification_params.h"
+#include "net/base/net_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/notifications/notifications_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
@@ skipping 111 matching lines @@
 void DesktopNotificationService::ShowDesktopNotification(
     const content::ShowDesktopNotificationHostMsgParams& params,
     content::RenderFrameHost* render_frame_host,
     scoped_ptr<content::DesktopNotificationDelegate> delegate,
     base::Closure* cancel_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const GURL& origin = params.origin;
   NotificationObjectProxy* proxy =
       new NotificationObjectProxy(render_frame_host, delegate.Pass());
 
+  int process_id = render_frame_host->GetProcess()->GetID();
+
+  // TODO(dewittj): The origin of file:// URLs always appears to be the empty
+  // URL.  We need a better way to display this than returning an empty string.
   base::string16 display_source = DisplayNameForOriginInProcessId(
-      origin, render_frame_host->GetProcess()->GetID());
+      origin, process_id);
+
   Notification notification(origin, params.icon_url, params.title,
       params.body, params.direction, display_source, params.replace_id,
       proxy);
 
+  // Web notifications should display their origin
+  notification.set_context_message(display_source);
+
   // The webkit notification doesn't timeout.
   notification.set_never_timeout(true);
 
   g_browser_process->notification_ui_manager()->Add(notification, profile_);
   if (cancel_callback)
     *cancel_callback =
         base::Bind(&CancelNotification,
                    proxy->id(),
                    NotificationUIManager::GetProfileID(profile_));
 
@@ skipping 17 matching lines @@
       for (extensions::ExtensionSet::const_iterator iter = extensions.begin();
            iter != extensions.end(); ++iter) {
         NotifierId notifier_id(NotifierId::APPLICATION, (*iter)->id());
         if (IsNotifierEnabled(notifier_id))
           return base::UTF8ToUTF16((*iter)->name());
       }
     }
   }
 #endif
 
-  return base::UTF8ToUTF16(origin.host());
+  std::string languages =
+      profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
+
+  std::string displayed_origin;
+  if (origin.SchemeIsHTTPOrHTTPS()) {
+    base::string16 rv = net::IDNToUnicode(origin.host(), languages);

[Peter Beverloo, 2014/10/17 11:17:59]

What does |rv| stand for? Can we use a clearer name, for example "domain"?

[dewittj, 2014/10/17 18:24:13]

Done.

+    if (origin.has_port()) {
+      rv.push_back(':');
+      std::string port = origin.port();
+      rv.insert(rv.end(), port.begin(), port.end());

[Jun Mukai, 2014/10/16 22:43:22]

rv.append(base::UTF8ToUTF16(origin.port())) would be more concise and safer I
guess.

[dewittj, 2014/10/17 18:24:12]

Done.

+    }
+    return rv;
+  }
+
+  return net::FormatUrl(GURL(displayed_origin), languages);

[Peter Beverloo, 2014/10/17 11:17:59]

|displayed_origin| is guaranteed to be an empty string when we get here, that
can't be your intention.

[dewittj, 2014/10/17 18:24:13]

Yes, I had some uncommitted fixes in my tree that I managed not to upload :(

 }
 
 bool DesktopNotificationService::IsNotifierEnabled(
     const NotifierId& notifier_id) {
   switch (notifier_id.type) {
     case NotifierId::APPLICATION:
       return disabled_extension_ids_.find(notifier_id.id) ==
           disabled_extension_ids_.end();
     case NotifierId::WEB_PAGE:
       return DesktopNotificationProfileUtil::GetContentSetting(
@@ skipping 130 matching lines @@
   // Tell the IO thread that this extension's permission for notifications
   // has changed.
   extensions::InfoMap* extension_info_map =
       extensions::ExtensionSystem::Get(profile_)->info_map();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&extensions::InfoMap::SetNotificationsDisabled,
                  extension_info_map, notifier_id.id, !enabled));
 #endif
 }