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

chrome/browser/notifications/desktop_notification_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 83 matching lines @@
   // Show a desktop notification. If |cancel_callback| is non-null, it's set to
   // a callback which can be used to cancel the notification.
   void ShowDesktopNotification(
       const content::ShowDesktopNotificationHostMsgParams& params,
       content::RenderFrameHost* render_frame_host,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback);
 
   // Returns true if the notifier with |notifier_id| is allowed to send
   // notifications.
-  bool IsNotifierEnabled(const message_center::NotifierId& notifier_id);
+  bool IsNotifierEnabled(const message_center::NotifierId& notifier_id) const;
 
   // Updates the availability of the notifier.
   void SetNotifierEnabled(const message_center::NotifierId& notifier_id,
                           bool enabled);
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(DesktopNotificationServiceTest,
+                           TestOriginDisplayName);
   // Returns a display name for an origin in the process id, to be used in
   // permission infobar or on the frame of the notification toast.  Different
   // from the origin itself when dealing with extensions.
   base::string16 DisplayNameForOriginInProcessId(const GURL& origin,
-                                                 int process_id);
+                                                 int process_id) const;
+
+#if defined(ENABLE_EXTENSIONS)
+  bool ExtensionDisplayName(const GURL& origin,
+                            int process_id,
+                            base::string16* out) const;
+#endif
+
+  static base::string16 OriginDisplayName(const GURL& origin,
+                                          std::string languages);

[Peter Beverloo, 2014/10/18 09:31:02]

const std::string&

[dewittj, 2014/10/29 16:21:25]

I don't think we want to return a string reference since it's a local variable.

Additionally it should remain a string16 since it's going to be used in UI
right?

 
   // Called when the string list pref has been changed.
   void OnStringListPrefChanged(
       const char* pref_name, std::set<std::string>* ids_field);
 
   // Called when the disabled_extension_id pref has been changed.
   void OnDisabledExtensionIdsChanged();
 
   // Used as a callback once a permission has been decided to convert |allowed|
   // to one of the blink::WebNotificationPermission values.
@@ skipping 39 matching lines @@
                  extensions::ExtensionRegistryObserver>
       extension_registry_observer_;
 #endif
 
   base::WeakPtrFactory<DesktopNotificationService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_