When extensions use notifications, display the name of the extension in UI ra...

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2009 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/worker_host/worker_process_host.h"
 #include "chrome/common/child_process_host.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "webkit/api/public/WebNotificationPresenter.h"
 
 using WebKit::WebNotificationPresenter;
 
 // Creates a data:xxxx URL which contains the full HTML for a notification
 // using supplied icon, title, and text, run through a template which contains
@@ skipping 54 matching lines @@
   int route_id_;
   int request_id_;
 };
 
 // The delegate for the infobar shown when an origin requests notification
 // permissions.
 class NotificationPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   NotificationPermissionInfoBarDelegate(TabContents* contents,
                                         const GURL& origin,
+                                        const std::wstring& display_name,
                                         int process_id,
                                         int route_id,
                                         int callback_context)
       : ConfirmInfoBarDelegate(contents),
         origin_(origin),
+        display_name_(display_name),
         profile_(contents->profile()),
         process_id_(process_id),
         route_id_(route_id),
         callback_context_(callback_context),
         action_taken_(false) {
   }
 
   // Overridden from ConfirmInfoBarDelegate:
   virtual void InfoBarClosed() {
     if (!action_taken_)
       UMA_HISTOGRAM_COUNTS("NotificationPermissionRequest.Ignored", 1);
 
     ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       new NotificationPermissionCallbackTask(
           process_id_, route_id_, callback_context_));
 
     delete this;
   }
 
   virtual std::wstring GetMessageText() const {
-    return l10n_util::GetStringF(IDS_NOTIFICATION_PERMISSIONS,
-                                 UTF8ToWide(origin_.spec()));
+    return l10n_util::GetStringF(IDS_NOTIFICATION_PERMISSIONS, display_name_);
   }
 
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
        IDR_PRODUCT_ICON_32);
   }
 
   virtual int GetButtons() const {
     return BUTTON_OK | BUTTON_CANCEL | BUTTON_OK_DEFAULT;
   }
@@ skipping 15 matching lines @@
     UMA_HISTOGRAM_COUNTS("NotificationPermissionRequest.Denied", 1);
     profile_->GetDesktopNotificationService()->DenyPermission(origin_);
     action_taken_ = true;
     return true;
   }
 
  private:
   // The origin we are asking for permissions on.
   GURL origin_;
 
+  // The display name for the origin to be displayed.  Will be different from
+  // origin_ for extensions.
+  std::wstring display_name_;
+
   // The Profile that we restore sessions from.
   Profile* profile_;
 
   // The callback information that tells us how to respond to javascript via
   // the correct RenderView.
   int process_id_;
   int route_id_;
   int callback_context_;
 
   // Whether the user clicked one of the buttons.
@@ skipping 77 matching lines @@
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   // Show an info bar requesting permission.
   Browser* browser = BrowserList::GetLastActive();
   if (!browser) {
     // Reached during ui tests.
     return;
   }
   TabContents* tab = browser->GetSelectedTabContents();
   if (!tab)
     return;
+
+  std::wstring display_name = DisplayNameForOrigin(origin);
+
   tab->AddInfoBar(new NotificationPermissionInfoBarDelegate(
-      tab, origin, process_id, route_id, callback_context));
+      tab, origin, display_name, process_id, route_id, callback_context));
 }
 
 void DesktopNotificationService::ShowNotification(
     const Notification& notification) {
   ui_manager_->Add(notification, profile_);
 }
 
 bool DesktopNotificationService::CancelDesktopNotification(
     int process_id, int route_id, int notification_id) {
   scoped_refptr<NotificationObjectProxy> proxy(
       new NotificationObjectProxy(process_id, route_id, notification_id,
                                   false));
-  Notification notif(GURL(), GURL(), proxy);
+  Notification notif(GURL(), GURL(), L"", proxy);
   return ui_manager_->Cancel(notif);
 }
 
 
 bool DesktopNotificationService::ShowDesktopNotification(
     const GURL& origin, const GURL& url, int process_id, int route_id,
     NotificationSource source, int notification_id) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   NotificationObjectProxy* proxy =
       new NotificationObjectProxy(process_id, route_id,
                                   notification_id,
                                   source == WorkerNotification);
-  Notification notif(origin, url, proxy);
+  Notification notif(origin, url, DisplayNameForOrigin(origin), proxy);
   ShowNotification(notif);
   return true;
 }
 
 bool DesktopNotificationService::ShowDesktopNotificationText(
     const GURL& origin, const GURL& icon, const string16& title,
     const string16& text, int process_id, int route_id,
     NotificationSource source, int notification_id) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   NotificationObjectProxy* proxy =
       new NotificationObjectProxy(process_id, route_id,
                                   notification_id,
                                   source == WorkerNotification);
   // "upconvert" the string parameters to a data: URL.
   string16 data_url = CreateDataUrl(icon, title, text);
-  Notification notif(origin, GURL(data_url), proxy);
+  Notification notif(
+      origin, GURL(data_url), DisplayNameForOrigin(origin), proxy);
   ShowNotification(notif);
   return true;
 }
+
+std::wstring DesktopNotificationService::DisplayNameForOrigin(
+    const GURL& origin) {
+  // If the source is an extension, lookup the display name.
+  if (origin.SchemeIs(chrome::kExtensionScheme)) {
+    ExtensionsService* ext_service = profile_->GetExtensionsService();
+    if (ext_service) {
+      Extension* extension = ext_service->GetExtensionByURL(origin);
+      if (extension)
+        return ASCIIToWide(extension->name());
+    }
+  }
+  return UTF8ToWide(origin.spec());
+}