Makes the response to CheckNotificationPermission asynchronous.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1828 matching lines @@
   }
 
   notification_service->RequestPermission(source_origin, render_process_id,
       render_view_id, callback_context, contents);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 WebKit::WebNotificationPresenter::Permission
-    ChromeContentBrowserClient::CheckDesktopNotificationPermission(
-        const GURL& source_origin,
-        content::ResourceContext* context,
-        int render_process_id) {
+ChromeContentBrowserClient::CheckDesktopNotificationPermission(
+    const GURL& source_origin,
+    content::ResourceContext* context,
+    int render_process_id) {
 #if defined(ENABLE_NOTIFICATIONS)
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  // Sometimes a notification may be invoked during the shutdown.
-  // See http://crbug.com/256638
-  if (browser_shutdown::IsTryingToQuit())
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  content::RenderProcessHost* process =
+      content::RenderProcessHost::FromID(render_process_id);
+  DCHECK(process);
+
+  Profile* profile = Profile::FromBrowserContext(process->GetBrowserContext());
+  DesktopNotificationService* notification_service =
+      DesktopNotificationServiceFactory::GetForProfile(profile);
+
+  if (!notification_service) {
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
-
-  ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
-
-  DesktopNotificationService* notification_service =
-      io_data->GetNotificationService();
-  if (notification_service) {
-    ExtensionInfoMap* extension_info_map = io_data->GetExtensionInfoMap();
-    ExtensionSet extensions;
-    extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin(
-        source_origin, render_process_id,
-        extensions::APIPermission::kNotification, &extensions);
-    for (ExtensionSet::const_iterator iter = extensions.begin();
-         iter != extensions.end(); ++iter) {
-      NotifierId notifier_id(NotifierId::APPLICATION, (*iter)->id());
-      if (notification_service->IsNotifierEnabled(notifier_id))
-        return WebKit::WebNotificationPresenter::PermissionAllowed;
-    }
-
-    return notification_service->HasPermission(source_origin);
   }
 
-  return WebKit::WebNotificationPresenter::PermissionNotAllowed;
+  return notification_service->HasPermission(source_origin, render_process_id);
 #else
   return WebKit::WebNotificationPresenter::PermissionAllowed;
 #endif
 }
 
 void ChromeContentBrowserClient::ShowDesktopNotification(
     const content::ShowDesktopNotificationHostMsgParams& params,
     int render_process_id,
     int render_view_id,
     bool worker) {
@@ skipping 650 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return chrome::NewCryptoModuleBlockingDialogDelegate(
       chrome::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome